[v9_12] Improve accuracy of query error logging

Merged Michał Kępień requested to merge 572-improve-accuracy-of-query-error-logging-v9_12 into v9_12

Closes #572 (closed)

Merge request reports