diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py
index 052265c6..85b71448 100644
--- a/rowers/views/importviews.py
+++ b/rowers/views/importviews.py
@@ -864,7 +864,18 @@ def rower_process_underarmourcallback(request):
 # Process TrainingPeaks callback
 @login_required()
 def rower_process_tpcallback(request):
-    code = request.GET['code']
+    try:
+        code = request.GET['code']
+    except MultiValueDictKeyError:
+        messages.error(request,"There was an error with the callback")
+        try:
+            errormessage = request.GET['error']
+            messages.error(request,errormessage)
+        except MultiValueDictKeyError:
+            pass
+        url = reverse('rower_exportsettings_view')
+        return HttpResponseRedirect(url)
+
     res = tpstuff.get_token(code)
 
     access_token = res[0]
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 630a8dca..516b21ea 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -6149,12 +6149,27 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
     except (OverflowError, ZeroDivisionError):
         avpace = datetime.timedelta(seconds=130)
 
+    try:
+        normspm = int(normspm)
+    except ValueError:
+        normspm = 18
+
+    try:
+        normw = int(normw)
+    except ValueError:
+        normw = 100
+
+    try:
+        normp = int(normp)
+    except ValueError:
+        normp = 100
+
     data = {
-        'power': int(normp),
+        'power': normp,
         'pace': avpace,
         'selector': 'power',
-        'work': int(normw),
-        'spm': int(normspm),
+        'work': normw,
+        'spm': normspm,
         'activeminutesmin': 0,
         'activeminutesmax': activeminutesmax,
         }