diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index cb22cecc..8c00e384 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1273,8 +1273,7 @@ def new_workout_from_file(r, f2,
     message = None
     try:
         fileformat = get_file_type(f2)
-        print(fileformat,'aa')
-    except IOError:
+    except (IOError,UnicodeDecodeError):
         os.remove(f2)
         message = "Rowsandall could not process this file. The extension is supported but the file seems corrupt. Contact info@rowsandall.com if you think this is incorrect."
         return (0, message, f2)
diff --git a/rowers/middleware.py b/rowers/middleware.py
index 9b49e13a..35a979ca 100644
--- a/rowers/middleware.py
+++ b/rowers/middleware.py
@@ -131,6 +131,10 @@ class RowerPlanMiddleWare(object):
                     messages.error(request,messg)
                     r = getrower(request.user)
                     r.rowerplan = 'basic'
+                    r.paymenttype = 'single'
+                    basicplans = PaidPlan.objects.filter(shortname='basic',price=0,
+                                                         paymentprocessor='braintree')
+                    r.paidplan = basicplans[0]
                     r.save()
                     # send email
                     job = myqueue(queue,
diff --git a/rowers/templates/paidplans.html b/rowers/templates/paidplans.html
index 52b03cdf..e8ced5c7 100644
--- a/rowers/templates/paidplans.html
+++ b/rowers/templates/paidplans.html
@@ -227,7 +227,7 @@
           </tr>
           <tr>
             <td>
-              Available upgrades
+              Available <a href="/rowers/upgrade/">upgrades</a>
             </td>
             <td>
               &nbsp;
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 831b55ca..fa8efe1e 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/utils.py b/rowers/utils.py
index 92b3ff17..f0a1d4b9 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -493,9 +493,12 @@ def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high
 
     for data in s.json():
         y = None
-        if data['type'] == metric:
-            return  np.array(data['data'])
-    
+        try:
+            if data['type'] == metric:
+                return  np.array(data['data'])
+        except TypeError:
+            return None
+            
     return None
 
 def allmonths(startdate,enddate):