2 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs
index a2f6740..e4ce1f3 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs
@@ -590,6 +590,9 @@ namespace OpenSim.Capabilities.Handlers
                 // Do some post-processing. May need to fetch more from inv server for links
                 foreach (InventoryCollection contents in fetchedContents)
                 {
+                    if (contents == null)
+                        continue;
+
                     InventoryCollectionWithDescendents coll = new InventoryCollectionWithDescendents();
                     coll.Collection = contents;
 
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index c694d27..80a3df2 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -302,6 +302,7 @@ namespace OpenSim.Services.Connectors
                         {
                             m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: Folder id does not match. Expected {0} got {1}",
                                 folderIDs[i], fid);
+                            m_log.WarnFormat("[XINVENTORY SERVICES CONNECTOR]: ", String.Join(",", folderIDs), String.Join(",", resultSet.Keys));
                         }
 
                         i += 1;