Don't override specific error messages with generic ones.

Addresses #1960.