1 files changed, 12 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 1c7baa2..3f640c5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -806,10 +806,18 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 finally
                 {
                     // Reclaim memory, these are unmanaged resources
-                    mapTexture.Dispose();
-                    image.Dispose();
-                    imgstream.Close();
-                    imgstream.Dispose();
+                    // If we encountered an exception, one or more of these will be null
+                    if (mapTexture != null)
+                        mapTexture.Dispose();
+
+                    if (image != null)
+                        image.Dispose();
+
+                    if (imgstream != null)
+                    {
+                        imgstream.Close();
+                        imgstream.Dispose();
+                    }
                 }
             }
             else