merge pull request to die gracefully when server is unreachable