Fred's machine, due to this routine falling off the end and returning
None.  Sync'ing the connection after a ConflictError appears to fix
it, or at least make it much less likely to fail.