diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 20573d2b..5c9d0c33 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -468,7 +468,7 @@ def setcp(workout, background=False, recurrance=True):
     try:
         if strokesdf['power'].std() == 0:
             return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
-    except KeyError:
+    except (KeyError, TypeError):
         return pd.DataFrame(), pd.Series(dtype='float'), pd.Series(dtype='float')
 
     if background:  # pragma: no cover
diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index ad946f8e..f04a478c 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1252,6 +1252,8 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
     columns = [c for c in columns if c != 'None']
     columns = list(set(columns))
 
+    df = pd.DataFrame()
+
     if len(ids) > 1:
         for id, f in zip(ids, csvfilenames):
             try: