Minor changes made to the exceptions