Merge Kloadut PR + handle better errors when file is not in the database