Backport the origin error types into V1