Better handling of server side errors