diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7249c5dad8..3fc6662c47 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -350,6 +350,22 @@ namespace OpenSim
                         }
                     }
                     break;
+                case "terrain-sim":
+                    string result2 = "";
+                    foreach (Scene scene in m_localScenes)
+                    {
+                        if (scene.RegionInfo.RegionName.ToLower() == cmdparams[0].ToLower())
+                        {
+                            string[] tmpCmdparams = new string[cmdparams.Length - 1];
+                            cmdparams.CopyTo(tmpCmdparams,1);
+
+                            if (!scene.Terrain.RunTerrainCmd(tmpCmdparams, ref result2, scene.RegionInfo.RegionName))
+                            {
+                                m_log.Error(result2);
+                            }
+                        }
+                    }
+                    break;
                 case "script":
                     foreach (Scene scene in m_localScenes)
                     {
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
index 4976e5d3fa..f54fd67f67 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
@@ -426,7 +426,10 @@ namespace OpenSim.Region.Terrain
                                 break;
 
                             case "grdmap":
-                                ExportImage(filename, args[3]);
+                                if (args.Length >= 4)
+                                    ExportImage(filename, args[3]);
+                                else
+                                    ExportImage(filename, "defaultstripe.png");
                                 break;
 
                             case "png":