refs #399, fix error codes post merge