Merge branch 'jh/p4-fix-use-of-process-error-exception'