Enhancing error/warning messages

 closes #2692