diff --git a/src/javascripts/ng-admin/Main/run/ErrorHandler.js b/src/javascripts/ng-admin/Main/run/ErrorHandler.js
index cfad2d56..e726037d 100644
--- a/src/javascripts/ng-admin/Main/run/ErrorHandler.js
+++ b/src/javascripts/ng-admin/Main/run/ErrorHandler.js
@@ -3,18 +3,19 @@
 define(function () {
     'use strict';
 
-    function errorHandler($rootScope, $state, $location) {
+    function errorHandler($rootScope, $state, notification) {
         $rootScope.$on("$stateChangeError", function handleError(event, toState, toParams, fromState, fromParams, error) {
             if (error.status == 404) {
                 $state.go('ma-404');
                 event.preventDefault();
             } else {
+                notification.log('State change error: ' + error.message, { addnCls: 'humane-flatty-error' });
                 throw error;
             }
         });
     }
 
-    errorHandler.$inject = ['$rootScope', '$state', '$location'];
+    errorHandler.$inject = ['$rootScope', '$state', 'notification'];
 
     return errorHandler;
 });
diff --git a/src/javascripts/ng-admin/Main/run/Loader.js b/src/javascripts/ng-admin/Main/run/Loader.js
index fa95699e..f062b6c0 100644
--- a/src/javascripts/ng-admin/Main/run/Loader.js
+++ b/src/javascripts/ng-admin/Main/run/Loader.js
@@ -19,6 +19,10 @@ define(function () {
             progression.done();
             $window.scrollTo(0, 0);
         });
+
+        $rootScope.$on("$stateChangeError", function() {
+            progression.done();
+        });
     }
 
     loader.$inject = ['$rootScope', '$window', 'progression'];