diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagUtil.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagUtil.java
index 972a6ae0..c741f2d2 100644
--- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagUtil.java
+++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagUtil.java
@@ -48,7 +48,7 @@ public static Map<String, Object> marshal(Map<Flag<?>, Object> values) {
         for (Entry<Flag<?>, Object> entry : values.entrySet()) {
             try {
                 rawValues.put(entry.getKey().getName(), marshal(entry.getKey(), entry.getValue()));
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 log.log(Level.WARNING, "Failed to marshal flag value for " + entry.getKey() + "; value is " + entry.getValue(), e);
             }
         }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java
index 13dfeb6a..741d1749 100644
--- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java
+++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java
@@ -144,7 +144,7 @@ public Map<Flag<?>, Object> unmarshal(Map<String, Object> rawValues, boolean cre
                     } else {
                         log.warning("Failed to parse flag '" + flag.getName() + "' with value '" + entry.getValue() + "'");
                     }
-                } catch (Exception e) {
+                } catch (Throwable e) {
                     log.log(Level.WARNING, "Failed to unmarshal flag value for " + flag, e);
                 }
             }