Uncapture file I/O errors, file not found.
Merge commit '7a6cfec8e90ad3d40b70dc3acda7150ce1b12f6b'