diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 03ccaa7c..7f4ac8c1 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -306,7 +306,11 @@ def workout_video_create_view(request,id=0):
             url = form.cleaned_data['url']
             delay = form.cleaned_data['delay']
             metricsgroups = metricsform.cleaned_data['groups']
-            video_id = get_video_id(url)
+            try:
+                video_id = get_video_id(url)
+            except ValueError:
+                messages.error(request,"Not a valid YouTube video link")
+                video_id = None
             if 'save_button' in request.POST:
                 analysis = VideoAnalysis(
                     workout=w,
@@ -6440,6 +6444,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
         })
         savebutton = 'savestringform'
 
+    vals = None
     # we are saving the results obtained from the power update form
     elif request.method == 'POST' and 'selector' in request.POST:
         powerupdateform = PowerIntervalUpdateForm(request.POST)