Fixing null pointer exceptions + add disconnection zombies at a random time
Merge remote-tracking branch 'origin/master'