Simplify error messages, and remove a needless conditional.