Another segfault fix, this time in query-by-clientid