diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
index e8e729fd72..43e71b38db 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -190,6 +190,15 @@ function ContentEditController($scope, $rootScope, $routeParams, $q, $timeout, $
 
                     $scope.page.buttonGroupState = "success";
 
+                }, function (err) {
+                    $scope.page.buttonGroupState = "error";
+                    $scope.busy = false;
+                    //show any notifications
+                    if (angular.isArray(err.data.notifications)) {
+                        for (var i = 0; i < err.data.notifications.length; i++) {
+                            notificationsService.showNotification(err.data.notifications[i]);
+                        }
+                    }
                 });
         }
 
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
index 406ecdf5f9..90b8c258b0 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
@@ -42,10 +42,10 @@ describe('edit content controller tests', function () {
         it('it should have an content object', function() {
 
             //controller should have a content object
-            //expect(scope.content).toNotBe(undefined);
+            expect(scope.content).not.toBeUndefined();
 
             //if should be the same as the routeParams defined one
-            //expect(scope.content.id).toBe(1234);
+            expect(scope.content.id).toBe(1234);
         });
 
         it('it should have a tabs collection', function () {
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
index 397d6eddab..1c7b99cc01 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
@@ -41,10 +41,10 @@ describe('edit media controller tests', function () {
         it('it should have an media object', function() {
 
             //controller should have a content object
-            //expect(scope.content).toNotBe(undefined);
+            expect(scope.content).not.toBeUndefined();
 
             //if should be the same as the routeParams defined one
-            //expect(scope.content.id).toBe(1234);
+            expect(scope.content.id).toBe(1234);
         });
 
         it('it should have a tabs collection', function () {
diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
index d633b6520d..9951a79793 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
@@ -59,19 +59,19 @@ describe('Content picker controller tests', function () {
         };
 
         it('should define the default properties on construction', function () {
-            //expect(scope.model.value).toNotBe(undefined);
+            expect(scope.model.value).not.toBeUndefined();            
         });
         
         it("should populate scope.renderModel", function(){
-            //expect(scope.renderModel).toNotBe(undefined);
-            //expect(scope.renderModel.length).toBe(3);
+            expect(scope.renderModel).not.toBeUndefined();
+            expect(scope.renderModel.length).toBe(3);
         });
 
         it("Each rendermodel item should contain name, id and icon", function(){
             var item = scope.renderModel[0];
-            //expect(item.name).toNotBe(undefined);
-            //expect(item.id).toBe(1233);
-            //expect(item.icon).toNotBe(undefined);
+            expect(item.name).not.toBeUndefined();
+            expect(item.id).toBe(1233);
+            expect(item.icon).not.toBeUndefined();
         });
 
         it("Removing an item should update renderModel, ids and model.value", function(){
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
index fb77812fa5..f091cff313 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
@@ -36,8 +36,8 @@ describe('content factory tests', function () {
             $rootScope.$digest();
             $httpBackend.flush();
 
-            //expect(doc).toNotBe(undefined);
-            //expect(doc.id).toBe(1234);   
+            expect(doc).not.toBeUndefined();
+            expect(doc.id).toBe(1234);   
         });