am c1ca07ee: Merge "in GB requery() didn\'t throw exceptions (mostly)....
am c1ca07ee: Merge "in GB requery() didn\'t throw exceptions (mostly). replicate that in HC" into honeycomb
* commit 'c1ca07ee':
in GB requery() didn't throw exceptions (mostly). replicate that in HC