diff --git a/ietf/submit/views.py b/ietf/submit/views.py
index 5c2794e13..f27cd199e 100644
--- a/ietf/submit/views.py
+++ b/ietf/submit/views.py
@@ -27,7 +27,11 @@ def submit_index(request):
                 submit = form.save()
                 return HttpResponseRedirect(reverse(draft_status, None, kwargs={'submission_id': submit.submission_id, 'submission_hash': submit.get_hash()}))
         except IOError, e:
-            if not "Client read error" in str(e):
+            if "Client read error" in str(e): # The server got an IOError when trying to read POST data
+                form = UploadForm(request=request)
+                form._errors = {}
+                form._errors["__all__"] = form.error_class(["There was a failure receiving the complete form data -- please try again."])
+            else:
                 raise
     else:
         form = UploadForm(request=request)