diff --git a/src/com/sk89q/minecraft/util/commands/CommandsManager.java b/src/com/sk89q/minecraft/util/commands/CommandsManager.java
index bd725b1fe..77ee41716 100644
--- a/src/com/sk89q/minecraft/util/commands/CommandsManager.java
+++ b/src/com/sk89q/minecraft/util/commands/CommandsManager.java
@@ -346,6 +346,10 @@ public abstract class CommandsManager<T> {
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             } catch (InvocationTargetException e) {
+                if (e.getCause() instanceof CommandException) {
+                    throw (CommandException) e.getCause();
+                }
+                
                 throw new WrappedCommandException(e.getCause());
             }
         }