Fixed infinite error loop from partialSync!!! (and added better error handling for future)