CatchHandler now optionally passes the exception to the cleanups