changes for the exception