From d37106576d58849ef892e5484594e0c7f1456f3b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 23 Mar 2017 12:53:48 +1100
Subject: [PATCH] Adds null checks to the ContentTreeController too

---
 src/Umbraco.Web/Trees/ContentTreeController.cs     | 6 +++++-
 src/Umbraco.Web/Trees/ContentTreeControllerBase.cs | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index b0f5d59508..a9f0bda805 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -207,7 +207,11 @@ namespace Umbraco.Web.Trees
                 return false;
             }
 
-            IContent content = Services.ContentService.GetById(entity.Id);
+            var content = Services.ContentService.GetById(entity.Id);
+            if (content == null)
+            {
+                return false;
+            }
             return Security.CurrentUser.HasPathAccess(content);
         }
 
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 2a5e28496e..97c5daed96 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -308,7 +308,7 @@ namespace Umbraco.Web.Trees
         {
             IUmbracoEntity entity;
 
-            Guid idGuid = Guid.Empty;
+            Guid idGuid;
             int idInt;
             Udi idUdi;