Make more resilient to missing files