Adding sanity checks to prevent bad synchronizations