sync-engine-shared - Partial revert 78c68d
sync-engine-shared - More error handling