diff --git a/Common/src/main/java/net/goldtreeservers/worldguardextraflags/listeners/PlayerListener.java b/Common/src/main/java/net/goldtreeservers/worldguardextraflags/listeners/PlayerListener.java
index df93c93..61db55c 100644
--- a/Common/src/main/java/net/goldtreeservers/worldguardextraflags/listeners/PlayerListener.java
+++ b/Common/src/main/java/net/goldtreeservers/worldguardextraflags/listeners/PlayerListener.java
@@ -53,17 +53,25 @@ public class PlayerListener implements Listener
 		ApplicableRegionSet regions = this.plugin.getWorldGuardCommunicator().getRegionContainer().createQuery().getApplicableRegions(player.getLocation());
 		
 		Boolean keepInventory = WorldGuardUtils.queryValue(player, player.getWorld(), regions.getRegions(), Flags.KEEP_INVENTORY);
-		if (Boolean.TRUE.equals(keepInventory))
+		if (keepInventory != null)
 		{
-			event.setKeepInventory(true);
-			event.getDrops().clear();
+			event.setKeepInventory(keepInventory);
+			
+			if (keepInventory)
+			{
+				event.getDrops().clear();
+			}
 		}
 		
 		Boolean keepExp = WorldGuardUtils.queryValue(player, player.getWorld(), regions.getRegions(), Flags.KEEP_EXP);
-		if (Boolean.TRUE.equals(keepExp))
+		if (keepExp != null)
 		{
-			event.setKeepLevel(true);
-			event.setDroppedExp(0);
+			event.setKeepLevel(keepExp);
+
+			if (keepExp)
+			{
+				event.setDroppedExp(0);
+			}
 		}
 	}