diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/umbsetdirtyonchange.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/umbsetdirtyonchange.directive.js
index c13680a037..d4e77eda05 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/umbsetdirtyonchange.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/umbsetdirtyonchange.directive.js
@@ -7,7 +7,7 @@
 
             var formCtrl = ctrls[0];
             
-            if (ctrls.length > 1) {
+            if (ctrls.length > 1 && ctrls[1]) {
                 //if an ngModel is supplied, assign a render function which is called when the model is changed
                 var modelCtrl = ctrls[1];
                 var oldRender = modelCtrl.$render;
@@ -17,8 +17,9 @@
                     if (oldRender) {
                         oldRender();
                     }
-                };
-            } else {
+                }
+            }
+            else {
                 var initValue = attr.umbSetDirtyOnChange;
                 
                 attr.$observe("umbSetDirtyOnChange", function (newValue) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
index b5b9910465..38e32b7451 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
@@ -888,8 +888,8 @@ angular.module("umbraco")
             angular.forEach($scope.availableEditors, function (value, key) {
                 //If no translation is provided, keep using the editor name from the manifest
                 if (localizationService.dictionary.hasOwnProperty("grid_" + value.alias)) {
-                    localizationService.localize("grid_" + value.alias).then(function(value){
-                        value.name = value;
+                    localizationService.localize("grid_" + value.alias).then(function(v){
+                        value.name = v;
                     });
                 }
             });