diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 8824d714..50e4c7bc 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 e511b070..041879c0 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -769,8 +769,10 @@ def cpdata(workouts, options):
             minutevalue = int(tvalue)
         except TypeError:  # pragma: no cover
             minutevalue = 0
-
-        tvalue = int(60*(tvalue-minutevalue))
+        try:
+            tvalue = int(60*(tvalue-minutevalue))
+        except TypeError:  # pragma: no cover
+            tvalue = int(60*tvalue)
 
         if hourvalue >= 24:  # pragma: no cover
             hourvalue = 23
diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py
index 3a904289..300a8f78 100644
--- a/rowers/views/userviews.py
+++ b/rowers/views/userviews.py
@@ -535,7 +535,10 @@ def rower_exportsettings_view(request, userid=0):
 
 
             r.save()
-            messages.info(request, 'Settings saved')
+            if doset:
+                messages.info(request, 'Settings saved')
+            else: # pragma: no cover
+                messages.error(request, 'Settings not saved: Need a Pro account')
     else:
         form = RowerExportForm(instance=r)