EventStoreDispatcher more robust