Merge "Fix handling mkdir failure"