improved robustness of the server and error output