Merge "Fix a crash during file deletion."