diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index ceb22158..21739f73 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1200,7 +1200,10 @@ def fetchcp_new(rower,workouts):
     if len(data)>1:
         df = pd.concat(data,axis=0)
 
-    df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
+    try:
+        df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
+    except KeyError:
+        pd.Series(),pd.Series(),0,pd.DataFrame()
 
 
     df = df.sort_values(['delta']).reset_index()
@@ -1216,7 +1219,7 @@ def setcp(workout,background=False,recurrance=True):
             return pd.DataFrame(),pd.Series(),pd.Series()
     except KeyError:
         return pd.DataFrame(),pd.Series(),pd.Series()
-    
+
     if background:
         job = myqueue(queuelow,handle_setcp,strokesdf,filename,workout.id)
         return pd.DataFrame({'delta':[],'cp':[]}),pd.Series(),pd.Series()