diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index f96a3b6b..f4a20ba2 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1350,18 +1350,13 @@ def new_workout_from_file(r, f2,
 
     # handle non-Painsled by converting it to painsled compatible CSV
     if (fileformat != 'csv'):
-        try:
-            f2, summary, oarlength, inboard, fileformat = handle_nonpainsled(
-                f2,
-                fileformat,
-                summary=summary
-            )
-            if not f2:
-                message = 'Something went wrong'
-                return (0, message, '')
-        except Exception as e:
-            errorstring = str(sys.exc_info()[0])
-            message = 'Something went wrong: ' + e.message
+        f2, summary, oarlength, inboard, fileformat = handle_nonpainsled(
+            f2,
+            fileformat,
+            summary=summary
+        )
+        if not f2:
+            message = 'Something went wrong'
             return (0, message, '')
 
     dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py
index 156e14a3..4e1078a7 100644
--- a/rowers/stravastuff.py
+++ b/rowers/stravastuff.py
@@ -316,7 +316,10 @@ def get_workout(user,stravaid):
         coords = get_strava_stream(r,'latlng',stravaid)
         power = get_strava_stream(r,'power',stravaid)
 
-        nr_rows = len(t)
+        if t is not None:
+            nr_rows = len(t)
+        else:
+            return(0,"Error: Time data wasnt found")
 
         if nr_rows == 0:
             return (0,"Error: Time data had zero length")
@@ -701,7 +704,10 @@ def handle_strava_import_stroke_data(title,
     coords = get_strava_stream(r,'latlng',stravaid)
     power = get_strava_stream(r,'power',stravaid)
 
-    nr_rows = len(t)
+    if t is not None:
+        nr_rows = len(t)
+    else:
+        return 0
 
     if nr_rows == 0:
         return 0
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index cec5300f..0ec02725 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ