diff --git a/src/org/mcteam/factions/listeners/FactionsEntityListener.java b/src/org/mcteam/factions/listeners/FactionsEntityListener.java
index 90dd9898..7207e065 100644
--- a/src/org/mcteam/factions/listeners/FactionsEntityListener.java
+++ b/src/org/mcteam/factions/listeners/FactionsEntityListener.java
@@ -94,11 +94,6 @@ public class FactionsEntityListener extends EntityListener {
 		
 		Faction faction = Board.getFactionAt(new FLocation(event.getLocation()));
 		
-		// Explosions may happen in the wilderness
-		if (faction.isNone()) {
-			return;
-		}
-		
 		if (event.getEntity() instanceof Creeper && (
 				(faction.isNone() && Conf.wildernessBlockCreepers) ||
 				(faction.isNormal() && Conf.territoryBlockCreepers) ||
@@ -161,6 +156,12 @@ public class FactionsEntityListener extends EntityListener {
 			return true;
 		}
 		
+		// so we know from above that the defender isn't in a safezone... what about the attacker, sneaky dog that he might be?
+		if (Board.getFactionAt(new FLocation(attacker)).isSafeZone()) {
+			attacker.sendMessage("You can't hurt other players while you are in a SafeZone.");
+			return false;
+		}
+		
 		Relation relation = defender.getRelation(attacker);
 		
 		// Players without faction may be hurt anywhere