Fixing entities errors, adding a new error when file does not exist