diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 66c149b99..d79f3544a 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -342,6 +342,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
                 hashbang: options.hashbang !== false,
                 enableHistory: enableHistory()
             });
+        }).catch().then(function() {
             loading.hide();
         });
     }
diff --git a/src/controllers/loginpage.js b/src/controllers/loginpage.js
index b87eca9f9..a7acb9713 100644
--- a/src/controllers/loginpage.js
+++ b/src/controllers/loginpage.js
@@ -156,6 +156,7 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "cardSt
                     view.querySelector("#txtManualName").value = "";
                     showManualForm(view, false, false);
                 }
+            }).catch().then(function() {
                 loading.hide();
             });