diff --git a/core/src/main/java/co/aikar/commands/RegisteredCommand.java b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
index 36b6799f..c84cef4b 100644
--- a/core/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -171,10 +171,7 @@ public class RegisteredCommand<CEC extends CommandExecutionContext<CEC, ? extend
     }
 
     void handleException(CommandIssuer sender, List<String> args, Throwable e) {
-        while (e instanceof ExecutionException || e instanceof CompletionException) {
-            e = e.getCause();
-        }
-        if (e instanceof InvocationTargetException && e.getCause() instanceof InvalidCommandArgument) {
+        while (e instanceof ExecutionException || e instanceof CompletionException || e instanceof InvocationTargetException) {
             e = e.getCause();
         }
         if (e instanceof ShowCommandHelp) {