From 7f8045dc555458cb872ee5c92accbbbba6ddbc63 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Mon, 23 Sep 2013 13:30:39 +0200
Subject: [PATCH] Filters out media items that returns null

---
 .../WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
index 5c0d141e82..e16dd7cea4 100644
--- a/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
@@ -77,12 +77,13 @@ namespace Umbraco.Web.WebApi.Filters
             var toRemove = new List<dynamic>();
             foreach (dynamic item in items)
             {
-                var hasPathAccess = UserExtensions.HasPathAccess(item.Path, user.StartContentId, Constants.System.RecycleBinContent);
+                var hasPathAccess = (item != null && UserExtensions.HasPathAccess(item.Path, user.StartContentId, Constants.System.RecycleBinContent));
                 if (!hasPathAccess)
                 {
                     toRemove.Add(item);
                 }
             }
+
             foreach (var item in toRemove)
             {
                 items.Remove(item);