diff --git a/rowers/tasks.py b/rowers/tasks.py
index 870028f9..a07a41a0 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -3194,7 +3194,7 @@ def df_from_summary(data):
         spms = [0]
     try:
         hrs = [splits[0]['heart_rate']['average']]
-    except (KeyError, TypeError): # pragma: no cover
+    except (KeyError, TypeError, IndexError): # pragma: no cover
         hrs = [0]
 
     for split in splits:
@@ -3317,8 +3317,11 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
         df =  df_from_summary(data)
     else:
         #dologging('debuglog.log',json.dumps(s.json()))
-
-        strokedata = pd.DataFrame.from_dict(s.json()['data'])
+        try:
+            strokedata = pd.DataFrame.from_dict(s.json()['data'])
+        except AttributeError:
+            dologging('debuglog.log','No stroke data in stroke data')
+            return 0
 
         try:
             res = make_cumvalues(0.1*strokedata['t'])