Merge "Added a separate error message for mkdir failures"