Merge branch 'master' into careminster

1 files changed, 7 insertions, 6 deletions

diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index daf8c3a..41d5a7a 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -319,13 +319,14 @@ namespace OpenSim.Services.HypergridService
         public override InventoryItemBase GetItem(InventoryItemBase item)
         {
             InventoryItemBase it = base.GetItem(item);
+            if (it != null)
+            {
+                UserAccount user = m_Cache.GetUser(it.CreatorId);
 
-            UserAccount user = m_Cache.GetUser(it.CreatorId);
-
-            // Adjust the creator data
-            if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
-                it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
-
+                // Adjust the creator data
+                if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
+                    it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
+            }
             return it;
         }