Merge "Propagate exception to error code"