diff --git a/extensions/sdktools/extension.cpp b/extensions/sdktools/extension.cpp
index 3a8d7450..e41a165d 100644
--- a/extensions/sdktools/extension.cpp
+++ b/extensions/sdktools/extension.cpp
@@ -303,7 +303,14 @@ bool SDKTools::ProcessCommandTarget(cmd_target_info_t *info)
 		return true;
 	}
 
-	IGamePlayer *pTarget = playerhelpers->GetGamePlayer(info->admin);
+	IGamePlayer *pTarget = playerhelpers->GetGamePlayer(player_index);
+
+	if (pTarget == NULL)
+	{
+		info->reason = COMMAND_TARGET_NONE;
+		info->num_targets = 0;
+		return true;
+	}
 
 	info->reason = playerhelpers->FilterCommandTarget(pAdmin, pTarget, info->flags);
 	if (info->reason != COMMAND_TARGET_VALID)