(Issue #3780) consolidate error messages