Change for the Exception Handling