Merge "Catch NoSuchElementException in SyncManager." into main