diff --git a/core/src/com/unciv/ui/screens/devconsole/DevConsoleCommand.kt b/core/src/com/unciv/ui/screens/devconsole/DevConsoleCommand.kt
index e3af1a3314..3ecd61df45 100644
--- a/core/src/com/unciv/ui/screens/devconsole/DevConsoleCommand.kt
+++ b/core/src/com/unciv/ui/screens/devconsole/DevConsoleCommand.kt
@@ -17,9 +17,8 @@ interface ConsoleCommandNode:ConsoleCommand{
     val subcommands: HashMap<String, ConsoleCommand>
 
     override fun handle(console: DevConsolePopup, params: List<String>): String? {
-        if (params.isEmpty())
-            return "Available commands: " + subcommands.keys.joinToString()
-        val handler = subcommands[params[0]] ?: return "Invalid command"
+        if (params.isEmpty()) return "Available commands: " + subcommands.keys.joinToString()
+        val handler = subcommands[params[0]] ?: return "Invalid command. Available commands: " + subcommands.keys.joinToString()
         return handler.handle(console, params.drop(1))
     }
 
@@ -41,7 +40,7 @@ interface ConsoleCommandNode:ConsoleCommand{
     }
 }
 
-class ConsoleCommandRoot:ConsoleCommandNode{
+class ConsoleCommandRoot:ConsoleCommandNode {
     override val subcommands = hashMapOf<String, ConsoleCommand>(
         "unit" to ConsoleUnitCommands(),
         "city" to ConsoleCityCommands()
diff --git a/core/src/com/unciv/ui/screens/devconsole/DevConsolePopup.kt b/core/src/com/unciv/ui/screens/devconsole/DevConsolePopup.kt
index 71021991a8..05e0f973d4 100644
--- a/core/src/com/unciv/ui/screens/devconsole/DevConsolePopup.kt
+++ b/core/src/com/unciv/ui/screens/devconsole/DevConsolePopup.kt
@@ -64,7 +64,6 @@ class DevConsolePopup(val screen: WorldScreen) : Popup(screen) {
 
     private fun handleCommand(): String? {
         val params = getParams(textField.text)
-        if (params.isEmpty()) return "No command"
         return ConsoleCommandRoot().handle(this, params)
     }