Protect against non-existent paths
Merge pull request #14 from kilahm/master

Protect against non-existent paths