Handle missing files better