Fix broken error handler and associated test
Merge pull request #8 from zendesk/pobrien/err_handler_fix

Fix broken error handler and associated test