Merge branch 'jc/format-patch-error-check'