Patch #708604: Check more function results. Will backport to 2.2.
2 files changed