diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index f7448b65..916dc311 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -3229,6 +3229,9 @@ namespace TShockAPI
 			if (OnPlayerBuff(id, type, time))
 				return true;
 
+			if (TShock.Players[id] == null)
+				return false;
+
 			if (TShock.CheckIgnores(args.Player))
 			{
 				args.Player.SendData(PacketTypes.PlayerAddBuff, "", id);