Cleanup, Improve Exception Handler