changes made for exception