Improve the sync time and handle errors