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;
 
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 528080c35a..ed72857a40 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -76,7 +76,7 @@ namespace Umbraco.Web.Trees
                 entity,
                 Constants.ObjectTypes.MediaGuid,
                 parentId,
-                queryStrings,                
+                queryStrings,
                 entity.HasChildren && (isContainer == false));
 
             node.AdditionalData.Add("contentType", entity.ContentTypeAlias);
@@ -130,7 +130,7 @@ namespace Umbraco.Web.Trees
             menu.Items.Add<ActionRefresh>(ui.Text("actions", ActionRefresh.Instance.Alias), true);
 
             //if the media item is in the recycle bin, don't have a default menu, just show the regular menu
-            if (item.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
+            if (item.Path.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
             {
                 menu.DefaultMenuAlias = null;
             }
@@ -151,7 +151,13 @@ namespace Umbraco.Web.Trees
         /// <returns></returns>
         protected override bool HasPathAccess(string id, FormDataCollection queryStrings)
         {
-            var media = Services.MediaService.GetById(int.Parse(id));
+            var entity = GetEntityFromId(id);
+            if (entity == null)
+            {
+                return false;
+            }
+
+            var media = Services.MediaService.GetById(entity.Id);
             if (media == null)
             {
                 return false;