Add some error handling.  Refs #6766.
Merge branch 'feature/6766_log_info' into develop