diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
index 097602fe20..d5a21e0ba6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/validation/valsubview.directive.js
@@ -5,74 +5,78 @@
 * @description Used to show validation warnings for a editor sub view to indicate that the section content has validation errors in its data.
 * In order for this directive to work, the valFormManager directive must be placed on the containing form.
 **/
-(function() {
-  'use strict';
+(function () {
+    'use strict';
 
-  function valSubViewDirective() {
+    function valSubViewDirective() {
 
-    function controller($scope, $element) {
-      //expose api
-      return {
-        valStatusChanged: function(args) {
-          if (!args.form.$valid) {
-            var subViewContent = $element.find(".ng-invalid");
+        function controller($scope, $element) {
+            //expose api
+            return {
+                valStatusChanged: function (args) {
 
-            if (subViewContent.length > 0) {
-                $scope.model.hasError = true;
-                $scope.model.errorClass = args.showValidation ? 'show-validation' : null;
-            } else {
-                $scope.model.hasError = false;
-                $scope.model.errorClass = null;
+                    //TODO: Verify this is correct, does $scope.model ever exist?
+                    if ($scope.model) {
+                        if (!args.form.$valid) {
+                            var subViewContent = $element.find(".ng-invalid");
+
+                            if (subViewContent.length > 0) {
+                                $scope.model.hasError = true;
+                                $scope.model.errorClass = args.showValidation ? 'show-validation' : null;
+                            } else {
+                                $scope.model.hasError = false;
+                                $scope.model.errorClass = null;
+                            }
+                        }
+                        else {
+                            $scope.model.hasError = false;
+                            $scope.model.errorClass = null;
+                        }
+                    }
+                }
             }
-         }
-         else {
-             $scope.model.hasError = false;
-             $scope.model.errorClass = null;
-         }
         }
-      }
+
+        function link(scope, el, attr, ctrl) {
+
+            //if there are no containing form or valFormManager controllers, then we do nothing
+            if (!ctrl || !angular.isArray(ctrl) || ctrl.length !== 2 || !ctrl[0] || !ctrl[1]) {
+                return;
+            }
+
+            var valFormManager = ctrl[1];
+            scope.model.hasError = false;
+
+            //listen for form validation changes
+            valFormManager.onValidationStatusChanged(function (evt, args) {
+                if (!args.form.$valid) {
+
+                    var subViewContent = el.find(".ng-invalid");
+
+                    if (subViewContent.length > 0) {
+                        scope.model.hasError = true;
+                    } else {
+                        scope.model.hasError = false;
+                    }
+
+                }
+                else {
+                    scope.model.hasError = false;
+                }
+            });
+
+        }
+
+        var directive = {
+            require: ['?^^form', '?^^valFormManager'],
+            restrict: "A",
+            link: link,
+            controller: controller
+        };
+
+        return directive;
     }
 
-    function link(scope, el, attr, ctrl) {
-
-      //if there are no containing form or valFormManager controllers, then we do nothing
-      if (!ctrl || !angular.isArray(ctrl) || ctrl.length !== 2 || !ctrl[0] || !ctrl[1]) {
-        return;
-      }
-
-      var valFormManager = ctrl[1];
-      scope.model.hasError = false;
-
-      //listen for form validation changes
-      valFormManager.onValidationStatusChanged(function (evt, args) {
-          if (!args.form.$valid) {
-
-             var subViewContent = el.find(".ng-invalid");
-
-             if (subViewContent.length > 0) {
-                 scope.model.hasError = true;
-             } else {
-                 scope.model.hasError = false;
-             }
-
-          }
-          else {
-              scope.model.hasError = false;
-          }
-      });
-
-    }
-
-    var directive = {
-      require: ['?^^form', '?^^valFormManager'],
-      restrict: "A",
-      link: link,
-      controller: controller
-    };
-
-    return directive;
-  }
-
-  angular.module('umbraco.directives').directive('valSubView', valSubViewDirective);
+    angular.module('umbraco.directives').directive('valSubView', valSubViewDirective);
 
 })();
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 15554b7f50..8a81cedc2d 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -49,6 +49,7 @@ namespace Umbraco.Web.Editors
     {
         private readonly ManifestParser _manifestParser;
         private readonly UmbracoFeatures _features;
+        private readonly IRuntimeState _runtimeState;
         private BackOfficeUserManager<BackOfficeIdentityUser> _userManager;
         private BackOfficeSignInManager _signInManager;
 
@@ -56,10 +57,11 @@ namespace Umbraco.Web.Editors
         private const string TokenPasswordResetCode = "PasswordResetCode";
         private static readonly string[] TempDataTokenNames = { TokenExternalSignInError, TokenPasswordResetCode };
 
-        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features)
+        public BackOfficeController(ManifestParser manifestParser, UmbracoFeatures features, IRuntimeState runtimeState)
         {
             _manifestParser = manifestParser;
             _features = features;
+            _runtimeState = runtimeState;
         }
 
         protected BackOfficeSignInManager SignInManager => _signInManager ?? (_signInManager = OwinContext.GetBackOfficeSignInManager());
@@ -261,7 +263,7 @@ namespace Umbraco.Web.Editors
         [MinifyJavaScriptResult(Order = 1)]
         public JavaScriptResult ServerVariables()
         {
-            var serverVars = new BackOfficeServerVariables(Url, Current.RuntimeState, _features, GlobalSettings);
+            var serverVars = new BackOfficeServerVariables(Url, _runtimeState, _features, GlobalSettings);
 
             //cache the result if debugging is disabled
             var result = HttpContext.IsDebuggingEnabled