diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index a04e0e76..8f26fd6a 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1200,6 +1200,7 @@ def parsenonpainsled(fileformat,f2,summary):
         hasrecognized = True
     except KeyError:
         hasrecognized = False
+        return None, hasrecognized, '', 'unknown'
 
     # handle speed coach GPS 2
     if (fileformat == 'speedcoach2'):
diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py
index 4a4c8c75..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,7 @@ def handle_strava_import_stroke_data(title,
     coords = get_strava_stream(r,'latlng',stravaid)
     power = get_strava_stream(r,'power',stravaid)
 
-    if nr_rows is not None:
+    if t is not None:
         nr_rows = len(t)
     else:
         return 0