Modified Exception handling