@jmclaus yes I think it would be appropriate to make a separate PR to clean up the exception types. It doesn't make sense to make this one different than the rest of the file in a commit titled "i18n".