diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index e1dcd4c726..f0af5528d5 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
@@ -490,6 +490,11 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
         {
             if (args[0] == "terrain")
             {
+                if (args.Length == 1)
+                {
+                    m_commander.ProcessConsoleCommand("help", new string[0]);
+                    return;
+                }
                 string[] tmpArgs = new string[args.Length - 2];
                 int i;
                 for (i = 2; i < args.Length; i++)