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

Enhancing error/warning messages
Merge commit '8c287ed35f2677fea7d0201f9072bccdb46575c5'