refs #7400. Change what is thrown.
Merge branch 'feature/7400_remove_message' into develop