Enhancing error/warning messages closes #2692
Merge pull request #2693 from permcody/test_harness_2692

Enhancing error/warning messages