improved error messages, removed function names
Merge pull request #4816 from davidssmith/errfix

improved error messages, removed function names from error text; no changes to error formatting.