diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 11345c3d04..cae0b4128c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -706,17 +706,16 @@ namespace OpenSim
                     break;
 
                 case "export-map":
-                    if (m_sceneManager.CurrentScene != null)
-                    {
+                   
                         if (cmdparams.Length > 0)
                         {
-                            m_sceneManager.CurrentScene.ExportWorldMap(cmdparams[0]);
+                            m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]);
                         }
                         else
                         {
-                            m_sceneManager.CurrentScene.ExportWorldMap("exportmap.jpg");
+                            m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg");
                         }
-                    }
+                   
                     break;
 
                 default: