Handle when optional folders don't exist.
Merge pull request #1 from wulffeld/patch-1

Handle when optional folders don't exist.