Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index a82d0d1..e518329 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -129,6 +129,9 @@ namespace OpenSim.Services.HypergridService
 
         protected void AdjustIdentifiers(AssetMetadata meta)
         {
+            if (meta == null || m_Cache == null)
+                return;
+
             UserAccount creator = m_Cache.GetUser(meta.CreatorID);
             if (creator != null)
                 meta.CreatorID = m_ProfileServiceURL + "/" + meta.CreatorID + ";" + creator.FirstName + " " + creator.LastName;