diff --git a/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java b/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
index a066a9eb..0734ed5d 100644
--- a/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
+++ b/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
@@ -111,12 +111,12 @@ public final class AllyDesignationSystem {
 	 */
 	public static boolean isValidTarget(Entity attacker, Entity target){
 
-		// Always return true if the attacker is null
-		if(attacker == null) return true;
-
 		// Always return false if the target is null
 		if(target == null) return false;
 
+		// Always return true if the attacker is null - this must be after the target null check!
+		if(attacker == null) return true;
+
 		// Tests whether the target is the attacker
 		if(target == attacker) return false;