Merge change 20454

* changes:
  Added lightweight exception logging to AsyncQueryHandler.