Better handling of failed syncs