diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index ae9481cc..772a88aa 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 7b599b43..f8f21150 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -2109,8 +2109,11 @@ class SavedAnalysisView(UserPassesTestMixin, View):
             self.searchform = SearchForm(initial={'q': query})
         date_initial = {}
         if startdate:
-            self.analyses = self.analyses.filter(date__gte=startdate)                
-            date_initial['startdate'] = startdate
+            try:
+                self.analyses = self.analyses.filter(date__gte=startdate)                
+                date_initial['startdate'] = startdate
+            except ValidationError:
+                messages.error(request,"{startdate} is not a valid start date".format(startdate=startdate))
         if enddate:
             self.analyses = self.analyses.filter(date__lte=enddate)
             date_initial['enddate']  = enddate
diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py
index 6c7f9979..4b07edbc 100644
--- a/rowers/views/apiviews.py
+++ b/rowers/views/apiviews.py
@@ -192,7 +192,7 @@ def api_get_dataframe(startdatetime, df):
                          ' longitude': longitude,
                          })
 
-    return 200, "", data
+    return 200, "Success", data
     
 
 @login_required()
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 6a3313b4..93d4ad29 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -1833,10 +1833,12 @@ def virtualevent_compare_view(request, id=0):
                         id=id))
                 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,