diff --git a/src/de/steamwar/command/SWCommand.java b/src/de/steamwar/command/SWCommand.java
index 9b931a34..52845d2e 100644
--- a/src/de/steamwar/command/SWCommand.java
+++ b/src/de/steamwar/command/SWCommand.java
@@ -83,7 +83,11 @@ public class SWCommand extends AbstractSWCommand<Chatter> {
 
             @Override
             public List<String> suggest(Invocation invocation) {
-                return SWCommand.this.tabComplete(Chatter.of(invocation.source()), invocation.alias(), invocation.arguments());
+                String[] args = invocation.arguments();
+                if(args.length == 0)
+                    args = new String[]{""};
+
+                return SWCommand.this.tabComplete(Chatter.of(invocation.source()), invocation.alias(), args);
             }
 
             @Override