Better Exception handling
commit fix