Merge pull request #5307 from gilles-peskine-arm/test-missing-ret-check-202112-2.16

Backport 2.16: Missing error checks + test bug on unlikely failure