Revert error code enhancement since it does not work properly.