#1557 - Suganthi/Kavitha - Modified sync functionality to handle sync failure