Improved aborting the server