diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 039c3fa4f8..d78ade5fa7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -139,8 +139,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             string tempName = Path.GetTempFileName();
 
             Bitmap existingBitmap = null;
-            Bitmap thisBitmap;
-            Bitmap newBitmap;
+            Bitmap thisBitmap = null;
+            Bitmap newBitmap = null;
 
             try
             {
@@ -176,8 +176,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                 if (existingBitmap != null)
                     existingBitmap.Dispose();
 
-                thisBitmap.Dispose();
-                newBitmap.Dispose();
+                if (thisBitmap != null)
+                    thisBitmap.Dispose();
+
+                if (newBitmap != null)
+                    newBitmap.Dispose();
 
                 if (File.Exists(tempName))
                     File.Delete(tempName);