Merge pull request #191 from jordandukart/7.x

Squash some warnings present when a query fails.
Fix a long standing typo.