diff --git a/src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs b/src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
index a2166e82c0..da14d57a38 100644
--- a/src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
+++ b/src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Web.umbraco.presentation
 
                 if (doc == null)
                 {
-                    Id = 0;
+                    Id = -1;
                     return;
                 }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
index 2af1add9fa..7782ae6654 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
@@ -102,14 +102,17 @@ namespace umbraco.presentation.umbraco.dialogs
 
                     if (Access.GetProtectionType(documentId) == ProtectionType.Simple)
                     {
-                        MembershipUser m = Access.GetAccessingMembershipUser(documentId);                        
-                        pane_simple.Visible = true;
-                        pp_pass.Visible = false;
-                        simpleLogin.Visible = false;
-                        SimpleLoginLabel.Visible = true;
-                        SimpleLoginLabel.Text = m.UserName;
-                        pane_advanced.Visible = false;
-                        bt_protect.CommandName = "simple";
+                        MembershipUser m = Access.GetAccessingMembershipUser(documentId);
+                        if (m != null)
+                        {
+                            pane_simple.Visible = true;
+                            pp_pass.Visible = false;
+                            simpleLogin.Visible = false;
+                            SimpleLoginLabel.Visible = true;
+                            SimpleLoginLabel.Text = m.UserName;
+                            pane_advanced.Visible = false;
+                            bt_protect.CommandName = "simple";    
+                        }
 
                     }
                     else if (Access.GetProtectionType(documentId) == ProtectionType.Advanced)
diff --git a/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs b/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs
index 6ab1bad3d8..d9d93a458e 100644
--- a/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs
+++ b/src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs
@@ -33,13 +33,13 @@ namespace umbraco.MacroEngines.Library
         public dynamic NodeById(int Id)
         {
             var node = new DynamicNode(Id);
-            if (node != null && node.Id == 0) return new DynamicNull();
+            if (node.Id == 0) return new DynamicNull();
             return node;
         }
         public dynamic NodeById(string Id)
         {
             var node = new DynamicNode(Id);
-            if (node != null && node.Id == 0) return new DynamicNull();
+            if (node.Id == 0) return new DynamicNull();
             return node;
         }
         public dynamic NodeById(DynamicNull Id)
@@ -53,7 +53,7 @@ namespace umbraco.MacroEngines.Library
                 return new DynamicNull();
             }
             var node = new DynamicNode(Id);
-            if (node != null && node.Id == 0) return new DynamicNull();
+            if (node.Id == 0) return new DynamicNull();
             return node;
         }
         public dynamic NodesById(List<object> Ids)