diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 86e43d2e..d062d1b5 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -5786,7 +5786,7 @@ def interactive_flex_chart2(id, r, promember=0,
 
     try:
         _ = rowdata[yparam1]
-    except KeyError:  # pragma: no cover
+    except (TypeError, KeyError):  # pragma: no cover
         yparam1 = 'None'
 
     # test if we have drive energy
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 35f0ce5c..a64038ca 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 93d4ad29..bf878249 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -1656,9 +1656,12 @@ def course_compare_view(request, id=0):
                 except Workout.DoesNotExist:  # pragma: no cover
                     pass
 
-    labeldict = {
-        int(w.id): w.__str__() for w in workouts
-    }
+    try:
+        labeldict = {
+            int(w.id): w.__str__() for w in workouts
+        }
+    except:
+        labeldict = {}
 
     res = interactive_multiple_compare_chart(workoutids, xparam, yparam,
                                              promember=promember,
@@ -1758,8 +1761,10 @@ def virtualevent_compare_view(request, id=0):
 
         return HttpResponseRedirect(url)
 
+    xparam = 'time'
+    yparam = 'pace'
+
     if request.method == 'GET':
-        xparam = 'time'
         if race.sessionmode == 'distance':
             xparam = 'cumdist'