diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index c6eb0a7947..f7f04ddef9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -906,34 +906,28 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 		}
-		
-		Player[] players = client.getCachedPlayers();
-		Player player = null;
-		int identifier = event.getIdentifier();
-
-		if (identifier >= 0 && identifier < players.length)
-		{
-			player = players[identifier];
-		}
-
-		if (player == null)
-		{
-			return;
-		}
 
 		//If the option is already to walk there, or cancel we don't need to swap it with anything
-		if (pOptionToReplace.equals(CANCEL) || pOptionToReplace.equals(WALK_HERE))
-			{
-				return;
-			}
+		if (!pOptionToReplace.equals(CANCEL) && !pOptionToReplace.equals(WALK_HERE))
+		{
+			Player[] players = client.getCachedPlayers();
+			int identifier = event.getIdentifier();
 
-		if (((config.getRemoveFreezePlayerCoX() &&  client.getVar(Varbits.IN_RAID) == 1)
-		|| (config.getRemoveFreezePlayerToB() &&  client.getVar(Varbits.THEATRE_OF_BLOOD) == 2))
-		&&  (player.isFriend() || player.isClanMember())
-		&& CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace))
+			if (identifier >= 0 && identifier < players.length)
 			{
-				addswap(pOptionToReplace);
+				Player player = players[identifier];
+				if (player != null)
+				{
+					if (((config.getRemoveFreezePlayerCoX() &&  client.getVar(Varbits.IN_RAID) == 1)
+						|| (config.getRemoveFreezePlayerToB() &&  client.getVar(Varbits.THEATRE_OF_BLOOD) == 2))
+						&&  (player.isFriend() || player.isClanMember())
+						&& CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace))
+					{
+						addswap(pOptionToReplace);
+					}
+				}
 			}
+		}
 
 		if (option.equals("talk-to"))
 		{