AMI-545 proxy error handling

PLEASEREVIEW @donemiliano @edsplunk

Fixed the thinko, added tests.  Back to 100% coverage!