Made changes to the exceptions