diff --git a/src/commands/CommandBuilder.cpp b/src/commands/CommandBuilder.cpp
index 0b349c8a9..f74edbbd5 100644
--- a/src/commands/CommandBuilder.cpp
+++ b/src/commands/CommandBuilder.cpp
@@ -179,6 +179,9 @@ void CommandBuilder::BuildCommand(const wxString &cmdStringArg)
 
    wxString cmdName = cmdString.Left(splitAt);
    wxString cmdParams = cmdString.Mid(splitAt+1);
+   if( splitAt < 0 )
+      cmdParams = "";
+
    cmdName.Trim(true);
    cmdParams.Trim(false);
 
diff --git a/src/commands/MessageCommand.cpp b/src/commands/MessageCommand.cpp
index ee49b95a0..166adba4a 100644
--- a/src/commands/MessageCommand.cpp
+++ b/src/commands/MessageCommand.cpp
@@ -24,7 +24,7 @@ wxString MessageCommandType::BuildName()
 void MessageCommandType::BuildSignature(CommandSignature &signature)
 {
    auto stringValidator = make_movable<DefaultValidator>();
-   signature.AddParameter(wxT("MessageString"), wxT(""), std::move(stringValidator));
+   signature.AddParameter(wxT("MessageString"), wxT("Connected"), std::move(stringValidator));
 }
 
 CommandHolder MessageCommandType::Create(std::unique_ptr<CommandOutputTarget> &&target)