The new "too many records" error can make an update fail without the error being logged. This commit fixes that. (cherry picked from commit 558923e5405894cf976d102f0d246a28bdbb400c)