Added missing file checks
Merge pull request #348 from stefk/file-checks

Added missing file checks