Adjustment for Exception handling