Improved Server quitting.