changes made for the exception handler