[bugfix] Need to check if a field is present in entities before trying to access it