diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 0ad27124..07e5e71c 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -209,13 +209,16 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0,id=''):
     query = request.POST.get('q')
     if query:
         query_list = query.split()
-        workouts = workouts.filter(
-            reduce(operator.and_,
-                   (Q(name__icontains=q) for q in query_list)) |
-            reduce(operator.and_,
+        try:
+            workouts = workouts.filter(
+                reduce(operator.and_,
+                    (Q(name__icontains=q) for q in query_list)) |
+                reduce(operator.and_,
                    (Q(notes__icontains=q) for q in query_list))
-            )
-        searchform = SearchForm(initial={'q':query})
+                   )
+            searchform = SearchForm(initial={'q':query})
+        except TypeError:
+            searchform = SearchForm()
     else:
         searchform = SearchForm()