Update exception types (awaiting pull request commit)