Refs #9830 Move logging statement to more sensible location.
Merge remote-tracking branch 'origin/bugfix/9830_diagnostics_error'