protection against non-existing list element

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

(cherry picked from commit a25a3b90)

Merge request reports