sync-engine-shared - Null checking