1 files changed, 14 insertions, 8 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 796be5b..3ae18f1 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -104,22 +104,28 @@ namespace OpenSim.Framework.Communications.Cache
 
             foreach (TextureImage texture in Textures.Values)
             {
-                if (texture.Temporary)
+                if (texture != null)
                 {
-                    temporaryImages++;
-                }
+                    if (texture.Temporary)
+                    {
+                        temporaryImages++;
+                    }
 
-                imageBytes += texture.Data.GetLongLength(0);
+                    imageBytes += texture.Data.GetLongLength(0);
+                }
             }
 
             foreach (AssetInfo asset in Assets.Values)
             {
-                if (asset.Temporary)
+                if (asset != null)
                 {
-                    temporaryAssets++;
-                }
+                    if (asset.Temporary)
+                    {
+                        temporaryAssets++;
+                    }
 
-                assetBytes += asset.Data.GetLongLength(0);
+                    assetBytes += asset.Data.GetLongLength(0);
+                }
             }
 
             m_log.InfoFormat("Temporary Images: {0}  Temporary Assets: {1}",