Rescue more file woes

A Errno::ENOENT is raised when the file no longer exists.  We should
rescue from this as well as IOError.