Merge "Cleanup in the face of upstream error"