Preserve 1.x client error behavior
- #2684