Added: Return null in wrapPlayer if the player is null.