Merge branch 'master' into careminster-presence-refactor

1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index ed87f3f..4e512e7 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -106,7 +106,10 @@ namespace OpenSim.Services.AssetService
                 return null;
 
             AssetBase asset = m_Database.GetAsset(assetID);
-            return asset.Metadata;
+            if (asset != null)
+                return asset.Metadata;
+
+            return null;
         }
 
         public byte[] GetData(string id)