Minor adjustments to error messages due to review of #3880.
Fix issues reported in ticket #3877.  Also added additional comments.