Issue #296: Adds failsafes
Merge remote-tracking branch 'origin/develop' into issues/291-change-processor-error-handling