Updated two exceptions to make more sense