Changes to some exceptions