diff --git a/application/Conversation.cpp b/application/Conversation.cpp
index 9dfa90b..10ed206 100644
--- a/application/Conversation.cpp
+++ b/application/Conversation.cpp
@@ -166,13 +166,12 @@ Conversation::ImMessage(BMessage* msg)
 			BString args = CommandArgs(body);
 			ChatCommand* cmd = _GetServer()->CommandById(name, fLooper->GetInstance());
 
-			if (cmd == NULL && name != "me") {
-				_WarnUser(BString(B_TRANSLATE("That isn't a valid command. "
-					"Try /help for a list.")));
-				break;
-			}
-			else {
-				fMessenger.SendMessage(msg);
+			if (cmd == NULL) {
+				if (name == "me")
+					fMessenger.SendMessage(msg);
+				else
+					_WarnUser(BString(B_TRANSLATE("That isn't a valid command. "
+						"Try /help for a list.")));
 				break;
 			}