1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index f968fdc..fdbe1f4 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -716,6 +716,9 @@ namespace OpenSim.Capabilities.Handlers
                     InventoryCollection[] linkedFolders = m_InventoryService.GetMultipleFoldersContent(coll.Collection.OwnerID, folderIDs.ToArray());
                     foreach (InventoryCollection linkedFolderContents in linkedFolders)
                     {
+                        if (linkedFolderContents == null)
+                            continue;
+
                         List<InventoryItemBase> links = linkedFolderContents.Items;
 
                         itemsToReturn.InsertRange(0, links);