Error handling for synchronizer improved