Fixed for scenarios where files are missing