Merge "Better validation of invalid files"