Improve file handling

…in case of missing file or properties