Skip invalid files during discovery
Merge pull request #4282 from mmascher/master

Skip invalid files during discovery