Ensure we only throw Error types defined in spec

[ronag]

Currently we throw some error types that are not in spec. Ensure we don't do this.

[ronag]

Fixed in #928