diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
index 2377a8800f..1f733f977a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
@@ -186,6 +186,11 @@ public class PlayerIndicatorsPlugin extends Plugin
 			return;
 		}
 
+		if (event.getTarget() == null)
+		{
+			return;
+		}
+
 		callerPiles.put(caller.getName(), event.getTarget());
 	}
 
@@ -286,7 +291,21 @@ public class PlayerIndicatorsPlugin extends Plugin
 			int image2 = -1;
 			Color color = null;
 
-			if (this.highlightFriends && client.isFriended(player.getName(), false))
+			if (this.highlightCallers && isCaller(player))
+			{
+				if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER)).contains(PlayerIndicationLocation.MENU))
+				{
+					color = relationColorHashMap.get(PlayerRelation.CALLER);
+				}
+			}
+			else if (this.highlightCallerTargets && isPile(player))
+			{
+				if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER_TARGET)).contains(PlayerIndicationLocation.MENU))
+				{
+					color = relationColorHashMap.get(PlayerRelation.CALLER_TARGET);
+				}
+			}
+			else if (this.highlightFriends && client.isFriended(player.getName(), false))
 			{
 				if (Arrays.asList(this.locationHashMap.get(PlayerRelation.FRIEND)).contains(PlayerIndicationLocation.MENU))
 				{
@@ -328,20 +347,7 @@ public class PlayerIndicatorsPlugin extends Plugin
 					color = relationColorHashMap.get(PlayerRelation.TARGET);
 				}
 			}
-			else if (this.highlightCallers && isCaller(player))
-			{
-				if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER)).contains(PlayerIndicationLocation.MENU))
-				{
-					color = relationColorHashMap.get(PlayerRelation.CALLER);
-				}
-			}
-			else if (this.highlightCallerTargets && isPile(player))
-			{
-				if (Arrays.asList(this.locationHashMap.get(PlayerRelation.CALLER_TARGET)).contains(PlayerIndicationLocation.MENU))
-				{
-					color = relationColorHashMap.get(PlayerRelation.CALLER_TARGET);
-				}
-			}
+
 
 			if (this.playerSkull && !player.isClanMember() && player.getSkullIcon() != null)
 			{
@@ -450,7 +456,13 @@ public class PlayerIndicatorsPlugin extends Plugin
 	 */
 	public boolean isPile(Actor actor)
 	{
-		if (!(actor instanceof Player))
+		/**
+		 if (!(actor instanceof Player))
+		 {
+		 return false;
+		 }
+		 **/
+		if (actor == null)
 		{
 			return false;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
index 4e1e6a866f..432290946c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
@@ -95,6 +95,21 @@ public class PlayerIndicatorsService
 		final List<Player> players = client.getPlayers();
 		for (Player p : players)
 		{
+			if (caller.test(p))
+			{
+				consumer.accept(p, PlayerRelation.CALLER);
+				continue;
+			}
+			if (callerTarget.test(p) )
+			{
+				consumer.accept(p, PlayerRelation.CALLER_TARGET);
+				continue;
+			}
+			if (other.test(p))
+			{
+				consumer.accept(p, PlayerRelation.OTHER);
+				continue;
+			}
 			if (self.test(p))
 			{
 				consumer.accept(p, PlayerRelation.SELF);
@@ -118,21 +133,6 @@ public class PlayerIndicatorsService
 			if (target.test(p))
 			{
 				consumer.accept(p, PlayerRelation.TARGET);
-				continue;
-			}
-			if (caller.test(p))
-			{
-				consumer.accept(p, PlayerRelation.CALLER);
-				continue;
-			}
-			if (callerTarget.test(p) )
-			{
-				consumer.accept(p, PlayerRelation.CALLER_TARGET);
-				continue;
-			}
-			if (other.test(p))
-			{
-				consumer.accept(p, PlayerRelation.OTHER);
 			}
 		}
 }