diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 03b0bffc..62dd7f64 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -64,7 +64,7 @@ def workout_video_view_mini(request,id=''):
     try:
         id = encoder.decode_hex(id)
         analysis = VideoAnalysis.objects.get(id=id)
-    except VideoAnalysis.DoesNotExist: # pragma: no cover
+    except (VideoAnalysis.DoesNotExist,ValueError): # pragma: no cover
         raise Http404("Video Analysis does not exist")
 
     w = analysis.workout
@@ -178,7 +178,7 @@ def workout_video_view(request,id=''):
     try:
         id = encoder.decode_hex(id)
         analysis = VideoAnalysis.objects.get(id=id)
-    except VideoAnalysis.DoesNotExist: # pragma: no cover
+    except (VideoAnalysis.DoesNotExist,ValueError): # pragma: no cover
         raise Http404("Video Analysis does not exist")
 
     w = analysis.workout