diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 23a2cc8652..0f68afe7d4 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -433,10 +433,6 @@ namespace OpenSim.Framework.Console
 
             foreach (string s in cmd)
             {
-                // If a user puts an empty string on the console then this cannot be part of the command.
-                if (s == "")
-                    break;
-
                 index++;
 
                 List<string> found = new List<string>();
@@ -447,8 +443,9 @@ namespace OpenSim.Framework.Console
                     {
                         found.Clear();
                         found.Add(opt);
+                        break;
                     }
-                    else if (opt.StartsWith(s))
+                    if (opt.StartsWith(s))
                     {
                         found.Add(opt);
                     }