Merge pull request #2045 from tmccombs/io-error-handling