Wrap and unwrap.

Exceptions are fun.

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -131,7 +131,7 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
 
         // register this so we can load world-dependent data right as the first world is loading
         if (worldInitListener != null) {
-            getLogger().warning("Server reload detected. This may cause various issues with WorldEdit and dependant plugins.");
+            getLogger().warning("Server reload detected. This may cause various issues with WorldEdit and dependent plugins.");
             try {
                 // these don't stick around between reload
                 loadAdapter();

worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/exception/ExceptionConverterHelper.java

@@ -76,6 +76,9 @@ public abstract class ExceptionConverterHelper implements ExceptionConverter {
                     if (e.getCause() instanceof CommandException) {
                         throw (CommandException) e.getCause();
                     }
+                    if (e.getCause() instanceof com.sk89q.minecraft.util.commands.CommandException) {
+                        throw new CommandException(e.getCause(), ImmutableList.of());
+                    }
                     throw new CommandExecutionException(e, ImmutableList.of());
                 } catch (IllegalArgumentException | IllegalAccessException e) {
                     throw new CommandExecutionException(e, ImmutableList.of());