From a35cb9277e5901f24ccb49070c7b1499927e36ac Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Thu, 14 Aug 2014 21:24:02 -0700
Subject: [PATCH] Handle CommandException in
 WorldGuardPlugin.convertThrowable().

---
 src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
index 82d4c088..5d526951 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
@@ -351,6 +351,8 @@ public String convertThrowable(@Nullable Throwable throwable) {
             return "WorldGuard: Task was interrupted";
         } else if (throwable instanceof UnresolvedNamesException) {
             return throwable.getMessage();
+        } else if (throwable instanceof CommandException) {
+            return throwable.getMessage();
         } else {
             getLogger().log(Level.WARNING, "WorldGuard encountered an unexpected error", throwable);
             return "WorldGuard: An unexpected error occurred! Please see the server console.";