diff --git a/rowers/views.py b/rowers/views.py
index 2a1b52aa..470ed0bd 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -8979,7 +8979,16 @@ def workout_upload_view(request,
 #	    f = request.FILES['file']
             f = form.cleaned_data['file']
 
-	    res = handle_uploaded_file(f)
+            if f is not None:
+	        res = handle_uploaded_file(f)
+            else:
+                messages.error("Something went wrong - no file attached")
+                url = reverse(workout_upload_view)
+                if is_ajax:
+                    return JSONResponse({'result':0,'url':0})
+                else:
+                    return HttpResponseRedirect(url)
+                
 	    t = form.cleaned_data['title']
 	    workouttype = form.cleaned_data['workouttype']
             request.session['docformoptions'] = {