diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py
index 98c58ce5..6c0cf8f0 100644
--- a/rowers/stravastuff.py
+++ b/rowers/stravastuff.py
@@ -167,6 +167,8 @@ def get_strava_workout(user,stravaid):
 	    t = np.array(timejson.json()[0]['data'])
 	    d =  np.array(distancejson.json()[0]['data'])
 	    nr_rows = len(t)
+            if nr_rows == 0:
+                return (0,"Error: Time data had zero length")
         except KeyError:
             return (0,"something went wrong with the Strava import")
 
diff --git a/rowers/views.py b/rowers/views.py
index 96f656d3..357eac60 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -4463,7 +4463,7 @@ def workout_c2import_view(request,message=""):
 def workout_getstravaworkout_view(request,stravaid):
     res = stravastuff.get_strava_workout(request.user,stravaid)
     if not res[0]:
-        message = "Something went wrong in Strava import"
+        message = res[1]
         return imports_view(request,message=message)
         
     strokedata = res[1]