1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 4f60462..6e7ace5 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -49,6 +49,9 @@ namespace OpenSim.Region.Communications.Local
             m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID);
 
             List<InventoryFolderBase> skeletonFolders = GetInventorySkeleton(userID);
+            if (skeletonFolders == null)
+                return;
+
             InventoryFolderImpl rootFolder = null;
 
             List<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();