Make error messages more explicit.
Merge pull request #695 from nla/bug/acm-dsc-740

Make error messages more explicit.