refs #7400. Apply simple fix.
refs #7400. Change what is thrown.
Merge remote-tracking branch 'origin/feature/7400_remove_message'