diff --git a/goKMS/kms/kms.go b/goKMS/kms/kms.go
index 536bfc17312eca58be32a7adcd6dc79ef4f9a9ac..0862711365b1f4e3293bd9bfd916c0e8d85e3a04 100644
--- a/goKMS/kms/kms.go
+++ b/goKMS/kms/kms.go
@@ -384,6 +384,11 @@ func (kms *KMS) AssignForwardingRoute(pId, pHop, nHop string, remoteKMS *util.Re
 	kms.routingTable[pathId] = tmpRoute
 	kms.routingTableMutex.Unlock()
 
+	if tmpRoute.RemoteKMS == nil {
+		log.Error("NOOOOO REMOTE KMS")
+		return fmt.Errorf("NOOOOO REMOTE KMS")
+	}
+
 	if tmpRoute.RemoteKMS != nil {
 		kms.remoteKMSMappingMutex.Lock()
 		if _, ok := kms.remoteKMSMapping[tmpRoute.RemoteKMS.Id]; !ok {
diff --git a/goKMS/kms/kmsintercom.go b/goKMS/kms/kmsintercom.go
index e1b332b3dfcb7aede3a2016754401974d5591b2a..6e7d61cd11254b1431550f6b8b70f51151c28bab 100644
--- a/goKMS/kms/kmsintercom.go
+++ b/goKMS/kms/kmsintercom.go
@@ -42,9 +42,9 @@ func (s *kmsTalkerServer) InterComCapabilities(ctx context.Context, in *pb.Inter
 	}
 
 	if in.ResetKeyStore {
-		log.Debugf("Resetting quantum module: %s for peer: %s", peerKmsId)
+		log.Debugf("Resetting quantum module: %s for peer: %s", peer.QuantumModule().ID(), peerKmsId)
 		peer.QuantumModule().Reset()
-		log.Debugf("Initializing quantum module: %s for peer: %s", peerKmsId)
+		log.Debugf("Initializing quantum module: %s for peer: %s", peer.QuantumModule().ID(), peerKmsId)
 		if err := peer.QuantumModule().Initialize(); err != nil {
 			return nil, status.Errorf(codes.Aborted, err.Error(), in.GetKmsId())
 		}