Bug fixes, takes less damage

Should no longer break if a player suddenly no longer becomes valid
(crashes or leaves).