We should do this for all handlers as well...  I'll open another pull request to clean up some of the exception handling.