diff --git a/src/de/steamwar/command/CommandPart.java b/src/de/steamwar/command/CommandPart.java
index 14b4079..09b8303 100644
--- a/src/de/steamwar/command/CommandPart.java
+++ b/src/de/steamwar/command/CommandPart.java
@@ -119,6 +119,8 @@ class CommandPart<T> {
                     current.add(typeMapper.map(sender, EMPTY_ARRAY, optional));
                 } else if(startIndex >= args.length) {
                     current.add(typeMapper.map(sender, EMPTY_ARRAY, optional));
+                } else {
+                    throw new CommandParseException();
                 }
             }
             if (next != null) {