diff --git a/rowers/tests/test_errorpages.py b/rowers/tests/test_errorpages.py
index 8a1a3e67..19941fb5 100644
--- a/rowers/tests/test_errorpages.py
+++ b/rowers/tests/test_errorpages.py
@@ -14,7 +14,8 @@ class TestErrorPages(TestCase):
 
         factory = RequestFactory()
         request = factory.get('/')
-        response = error404_view(request)
+        e = None
+        response = error404_view(request,e )
 
         self.assertEqual(response.status_code, 404)
         self.assertIn('404 Page not found', str(response.content))
@@ -22,7 +23,7 @@ class TestErrorPages(TestCase):
         self.assertEqual(response.status_code, 500)
         self.assertIn('500 Internal Server Error', str(response.content))
 
-        response = error400_view(request)
+        response = error400_view(request, e)
         self.assertEqual(response.status_code, 400)
 
 
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index b2a8c284..1bdec63d 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/views/errorviews.py b/rowers/views/errorviews.py
index f0c14f4a..d6f7cc7c 100644
--- a/rowers/views/errorviews.py
+++ b/rowers/views/errorviews.py
@@ -22,14 +22,14 @@ def error500_view(request):
     response.status_code = 500
     return response
 
-def error404_view(request):
+def error404_view(request, exception):
     response = render(request,'404.html', {},status=404)
 #				  context_instance = RequestContext(request))
 
     response.status_code = 404
     return response
 
-def error400_view(request):
+def error400_view(request, exception):
     response = render(request,'400.html', {},status=400)
 #				  context_instance = RequestContext(request))
 
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index c018755c..a01cf017 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -1798,7 +1798,10 @@ def workout_downloadwind_view(request,id=0,
         windspeed = winddata[0]
         windbearing = winddata[1]
         message = winddata[2]
-        row.notes += "\n"+message
+        try:
+            row.notes += "\n"+message
+        except TypeError:
+            pass
         row.save()
         rowdata.add_wind(windspeed,windbearing)
         rowdata.write_csv(f1,gzip=True)
@@ -1865,7 +1868,11 @@ def workout_downloadmetar_view(request,id=0,
         windspeed = winddata[0]
         windbearing = winddata[1]
         message = winddata[2]
-        row.notes += "\n"+message
+        try:
+            row.notes += "\n"+message
+        except TypeError:
+            pass
+        
         row.save()
         rowdata.add_wind(windspeed,windbearing)
         rowdata.write_csv(f1,gzip=True)