Merge "Set output value in error case"