Fix validation to handle double respawn edge case