Thanks for the patch! I agree with Nikita here. The change is dangerous. If there is no a diag, but the query failed, it means something is very wrong, and it is not safe to continue execution. A panic() would be better here.