diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 7f06aa68..e164c70e 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2450,7 +2450,12 @@ def workout_data_view(request, id=0):
     else:
         form = DataFrameColumnsForm(initial = {'cols':tcols})
 
-    datadf = datadf[tcols]
+    try:
+        datadf = datadf[tcols]
+    except KeyError:
+        tcols = list(set(datadf.columns(tolist)+tcols))
+        datadf = datadf[tcols]
+        datadf = datadf.fillna(value=0)
 
     for col in cols:
         try: