Add playerId error handling