Exception handling Changes