Catch os.error instead of all Exceptions
Merge pull request #9011 from Jorge-Rodriguez/develop

Catch os.error instead of all Exceptions