diff --git a/UI/WebServerResources/js/Contacts/AddressBook.service.js b/UI/WebServerResources/js/Contacts/AddressBook.service.js
index 552c312db..32be6a171 100644
--- a/UI/WebServerResources/js/Contacts/AddressBook.service.js
+++ b/UI/WebServerResources/js/Contacts/AddressBook.service.js
@@ -423,9 +423,7 @@
       var i = _.indexOf(_.pluck(list, 'id'), _this.id);
       list.splice(i, 1);
       d.resolve();
-    }, function(data, status) {
-      d.reject(data);
-    });
+    }, d.reject);
     return d.promise;
   };
 
diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js
index 37870ebfb..85d833788 100644
--- a/UI/WebServerResources/js/Contacts/AddressBooksController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js
@@ -105,10 +105,11 @@
             vm.service.selectedFolder = null;
             return true;
           })
-          .catch(function(data, status) {
+          .catch(function(response) {
+            var message = response.data.message || response.statusText;
             Dialog.alert(l('An error occured while deleting the addressbook "%{0}".',
                            vm.service.selectedFolder.name),
-                         l(data.error));
+                        message);
           });
       }
     }
diff --git a/UI/WebServerResources/js/Contacts/Contacts.app.js b/UI/WebServerResources/js/Contacts/Contacts.app.js
index 0f85f415f..227cd13bd 100644
--- a/UI/WebServerResources/js/Contacts/Contacts.app.js
+++ b/UI/WebServerResources/js/Contacts/Contacts.app.js
@@ -102,13 +102,16 @@
   /**
    * @ngInject
    */
-  stateAddressbook.$inject = ['$stateParams', 'stateAddressbooks', 'AddressBook'];
-  function stateAddressbook($stateParams, stateAddressbooks, AddressBook) {
-    var addressbook = _.find(stateAddressbooks, function(addressbook) {
+  stateAddressbook.$inject = ['$q', '$state', '$stateParams', 'AddressBook'];
+  function stateAddressbook($q, $state, $stateParams, AddressBook) {
+    var addressbook = _.find(AddressBook.$findAll(), function(addressbook) {
       return addressbook.id == $stateParams.addressbookId;
     });
-    addressbook.$reload();
-    return addressbook;
+    if (addressbook) {
+      addressbook.$reload();
+      return addressbook;
+    }
+    return $q.reject('Addressbook ' + $stateParams.addressbookId + ' not found');
   }
 
   /**
@@ -138,7 +141,7 @@
   function runBlock($rootScope, $log, $state) {
     $rootScope.$on('$stateChangeError', function(event, toState, toParams, fromState, fromParams, error) {
       $log.error(error);
-      $state.go('app');
+      $state.go('app.addressbook', { addressbookId: 'personal' });
     });
     $rootScope.$on('$routeChangeError', function(event, current, previous, rejection) {
       $log.error(event, current, previous, rejection);