1 files changed, 11 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5b6b9cb..a2fd01f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -167,14 +167,23 @@ namespace OpenSim.Region.Environment.Scenes
                     return;
                 }
 
-                item = userInfo.RootFolder.HasItem(oldItemID);
-                if (item == null)
+                if (userInfo.RootFolder != null)
+                {
+                    item = userInfo.RootFolder.HasItem(oldItemID);
+                    if (item == null)
+                    {
+                        MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString());
+                        return;
+                    }
+                }
+                else
                 {
                     MainLog.Instance.Warn("INVENTORY", "Failed to find item " + oldItemID.ToString());
                     return;
                 }
             }
 
+
             AssetBase asset = AssetCache.CopyAsset(item.assetID);
             if (asset == null)
             {