diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index e78db804a8..20bba4426d 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -226,7 +226,9 @@ void Manager::Terminate()
 	FlushLogBuffers();
 
 	for ( auto& p : bstate->endpoint.peers() )
-		bstate->endpoint.unpeer(p.peer.network->address, p.peer.network->port);
+		if ( p.peer.network )
+			bstate->endpoint.unpeer(p.peer.network->address,
+			                        p.peer.network->port);
 
 	bstate->endpoint.shutdown();
 	}