make error messages more self-consistent