Added some more exception handling to resoultion server