foolprofing for non-existing files
this should be even better
Merge branch 'foolproofing'