AMI-545 move proxy error handler to top level to avoid multiple error handlers piling up.