Merge "Handle failure to create file." into nyc-dev