Refs #6840  Incorporated errors in essential places
Merge branch 'feature/6840_errors' into develop