diff --git a/kms/kms.go b/kms/kms.go
index f4bdf223391b3d003cad15f9cde05d7084b2dc67..e07a446445a761fa33358c8b05c7694e439fd6bb 100644
--- a/kms/kms.go
+++ b/kms/kms.go
@@ -165,7 +165,8 @@ func (kms *EKMS) GenerateNewQleID() (uint32, error) {
 func (kms *EKMS) AddPeer(kmsPeerSocket string, servingQLE *QuantumElement) {
 	//check if peer exists
 	if _, there := kms.KmsPeers[kmsPeerSocket]; there {
-		log.Fatalf("Trying to add existing peer %s", kmsPeerSocket)
+		log.Printf("Trying to add existing peer %s", kmsPeerSocket)
+		return
 	}
 	peer := NewKmsPeer(servingQLE, kms.externalNotifierKMSPeer)
 	peer.tcpSocketStr = kmsPeerSocket