Improve ApiQueryProofread error handling

Change-Id: I00c2070dbe71efa19b0330d6237f31ffe23105a0