Cleanuphandler now optionally passes the exception