Merge "Propagate error status codes correctly"