Merge "if requery returns false, throw exception"