Merge "Fix a crash when a brand new file is added."