From 409594ead76418cebb59987d61407d533bd03d33 Mon Sep 17 00:00:00 2001
From: Alex Shorsher <alex.shorsher@kaleido.io>
Date: Thu, 18 Aug 2022 13:08:21 -0400
Subject: [PATCH] add nil check for aggregator during WaitStop

Signed-off-by: Alex Shorsher <alex.shorsher@kaleido.io>
---
 internal/events/event_manager.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/internal/events/event_manager.go b/internal/events/event_manager.go
index 46f9414f94..6d3b84fa61 100644
--- a/internal/events/event_manager.go
+++ b/internal/events/event_manager.go
@@ -202,7 +202,9 @@ func (em *eventManager) WaitStop() {
 		em.blobReceiver.stop()
 		em.blobReceiver = nil
 	}
-	<-em.aggregator.eventPoller.closed
+	if em.aggregator != nil {
+		<-em.aggregator.eventPoller.closed
+	}
 }
 
 func (em *eventManager) CreateUpdateDurableSubscription(ctx context.Context, subDef *core.Subscription, mustNew bool) (err error) {