I also took the opportunity to improve the disconnect handling for Disconnect messages from the server.