1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index 2a25d9c..ff28c0f 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -110,7 +110,9 @@ namespace OpenSim.Capabilities.Handlers
             List<InventoryCollection> invcollSet = Fetch(folders, bad_folders, ref total_folders, ref total_items);
             //m_log.DebugFormat("[XXX]: Got {0} folders from a request of {1}", invcollSet.Count, folders.Count);
 
-            int invcollSetCount = invcollSet.Count;
+            int invcollSetCount = 0;
+            if (invcollSet != null)
+                invcollSetCount = invcollSet.Count;
 
             int mem = 8192 + ((256 * invcollSetCount +
                                 384 * total_folders +