diff --git a/edivorce/apps/core/utils/efiling_submission.py b/edivorce/apps/core/utils/efiling_submission.py
index 7b51630b..5f94ae7d 100644
--- a/edivorce/apps/core/utils/efiling_submission.py
+++ b/edivorce/apps/core/utils/efiling_submission.py
@@ -31,7 +31,11 @@ class EFilingSubmission:
 
         url = f'{self.token_base_url}/auth/realms/{self.token_realm}/protocol/openid-connect/token'
 
-        response = requests.post(url, headers=headers, data=payload)
+        try:
+            response = requests.post(url, headers=headers, data=payload)
+        except:
+            return False
+
         logging.debug(f'EFH - Get Token {response.status_code}')
         if response.status_code == 200:
             response = json.loads(response.text)
@@ -148,7 +152,11 @@ class EFilingSubmission:
 
         url = f'{self.api_base_url}/submission/documents'
         print('DEBUG: ' + url)
-        response = self._get_api(request, url, transaction_id, bce_id, headers={}, files=files)
+        try:
+            response = self._get_api(request, url, transaction_id, bce_id, headers={}, files=files)
+        except:
+            return settings.FORCE_SCRIPT_NAME + "dashboard/initial_filing?no_connection=1", None
+
         if response.status_code == 200:
             response = json.loads(response.text)
 
diff --git a/edivorce/apps/core/views/efiling.py b/edivorce/apps/core/views/efiling.py
index 8c051f2e..ba08fc72 100644
--- a/edivorce/apps/core/views/efiling.py
+++ b/edivorce/apps/core/views/efiling.py
@@ -97,13 +97,13 @@ def _validate_and_submit_documents(request, responses, initial=False):
 
     msg, redirect_url = _package_and_submit(request, uploaded, generated, responses, initial)
 
+    if redirect_url:
+        return None, redirect_url
+
     if msg != 'success':
         errors.append(msg)
         return errors, None
 
-    if redirect_url:
-        return None, redirect_url
-
     return None, None