1 files changed, 11 insertions, 6 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
index a54d65524..28def271f 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
@@ -1,18 +1,23 @@
 using System;
+using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Api.HttpHandlers
 {
-    public class ItemHandler : JsonHandler
+    public class ItemHandler : BaseJsonHandler
     {
-        protected sealed override object ObjectToSerialize
+        protected sealed override object GetObjectToSerialize()
         {
-            get
-            {
-                Guid userId = Guid.Parse(QueryString["userid"]);
+            Guid userId = Guid.Parse(QueryString["userid"]);
+
+            BaseItem item = ItemToSerialize;
 
-                return ApiService.GetSerializationObject(ItemToSerialize, true, userId);
+            if (item == null)
+            {
+                return null;
             }
+
+            return ApiService.GetSerializationObject(item, true, userId);
         }
 
         protected virtual BaseItem ItemToSerialize