Cleaning up Exception handling