Merge branch 'jc/lock-report-on-error'