implements #986, streamline error messages