Merge pull request #1943 from andrei-21/feature/handle-read-dir-errors