more changes to make sure nothing sigaborts when the server is not working properly