Further improvements to missing file handling