From 1f1852f3cbe2a7899aea0d306a77d2eedb0434fc Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 4 Feb 2015 22:01:37 -0500
Subject: sync updates

---
 MediaBrowser.Controller/Entities/UserViewBuilder.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index a24a42535b..318c5fff3e 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -846,6 +846,11 @@ namespace MediaBrowser.Controller.Entities
             BaseItem queryParent,
             User user)
         {
+            if (items == null)
+            {
+                throw new ArgumentNullException("items");
+            }
+
             if (CollapseBoxSetItems(query, queryParent, user))
             {
                 items = BaseItem.CollectionManager.CollapseItemsWithinBoxSets(items, user);
-- 
cgit v1.2.3