diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 5528ee52..94bd517f 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -397,10 +397,10 @@ namespace TShockAPI
         private static bool HandlePlayerDamage(GetDataHandlerArgs args)
         {
             byte playerid = args.Data.ReadInt8();
-            if (playerid >= 0 && playerid <= Main.maxPlayers)
-                return !TShock.Players[playerid].TPlayer.hostile;
-            else
+            if (TShock.Players[playerid] == null)
                 return true;
+
+            return !TShock.Players[playerid].TPlayer.hostile;
         }
 
         private static bool HandleLiquidSet(GetDataHandlerArgs args)