When reindexing check for file before trying to open (refactored)
Eliminate extra assignment
Merge pull request #4875

f7e3637 Eliminate extra assignment (Suhas Daftuar)
ec7eb0f When reindexing check for file before trying to open (refactored) (Suhas Daftuar)