Handle quit better. The server needs some work to improve this