Added support for with-exception-handler