Fixed null user

Hopefully the last fix for the null user error, should now finally
remove a user if they disconnect while waiting for a partner.