Squash some warnings present when a query fails.
Merge pull request #192 from jordandukart/7.x

Squash some warnings present when a query fails.