Fix a couple repeated exception cases