Minor fix - Better treatment of FileNotFoundException