protection against missing fields in the raw file

Matthias Saimpertrequested to merge
cherry-pick-e2e35d9f into devel-2.2

(cherry picked from commit e2e35d9f)

Merge request reports