Do not error on "no such directory error"
Merge pull request #1415 from control-center/feature/CC-629

Do not error on "no such directory error"