Resolve "unchecked return in query.c"

Merged Mark Andrews requested to merge 635-unchecked-return-in-query-c-v9_11 into v9_11

Merge request reports