Improve CPS Exception handling