[#1865] Faris - Added logic to handle sync failures.