make sync more error tolerant