1 files changed, 6 insertions, 3 deletions
diff --git a/source/frontend/StarClientCommandProcessor.cpp b/source/frontend/StarClientCommandProcessor.cpp
index def1b43..2d98289 100644
--- a/source/frontend/StarClientCommandProcessor.cpp
+++ b/source/frontend/StarClientCommandProcessor.cpp
@@ -91,9 +91,12 @@ StringList ClientCommandProcessor::handleCommand(String const& commandLine) {
       }
     } else {
       auto player = m_universeClient->mainPlayer();
-      if (auto messageResult = player->receiveMessage(connectionForEntity(player->entityId()), "/" + command, { allArguments }))
-        result.append(messageResult->isType(Json::Type::String) ? *messageResult->stringPtr() : messageResult->repr(1, true));
-      else
+      if (auto messageResult = player->receiveMessage(connectionForEntity(player->entityId()), "/" + command, {allArguments})) {
+        if (messageResult->isType(Json::Type::String))
+          result.append(*messageResult->stringPtr());
+        else if (!messageResult->isNull())
+          result.append(messageResult->repr(1, true));
+      } else
         m_universeClient->sendChat(commandLine, ChatSendMode::Broadcast);
     }
     return result;