I'm ok doing it, I just didn't want to broadly sweep all the exception types in this PR.