diff --git a/goKMS/gnmiHandlers/kms/keyStoreHandler.go b/goKMS/gnmiHandlers/kms/keyStoreHandler.go
index 8697fb0692d3330f6deb83c1649185c16839d8af..b9be8da734beedd9fb5c48081f9ff532921220b1 100644
--- a/goKMS/gnmiHandlers/kms/keyStoreHandler.go
+++ b/goKMS/gnmiHandlers/kms/keyStoreHandler.go
@@ -42,7 +42,9 @@ func (yh *KeyStoreHandler) Init(config *handler.Config, publishToSubsFunc func([
 		return err
 	}
 
-	yh.updateOrCreateKeyStores()
+	if _, err := yh.updateOrCreateKeyStores(); err != nil {
+		return err
+	}
 
 	// Start the go routine that takes care of any update from the kms
 	go func() {
diff --git a/goKMS/kms/store/kms-keystore.go b/goKMS/kms/store/kms-keystore.go
index 297f1af5ecce5c055009106ed9f2e5e2f42d19c2..6a95b9e1083ec3996c0b333f4470de87236f00b2 100644
--- a/goKMS/kms/store/kms-keystore.go
+++ b/goKMS/kms/store/kms-keystore.go
@@ -71,7 +71,7 @@ func (ks *KmsKeyStore) AddKey(keyId uuid.UUID, keyToAdd []byte) error {
 	go func() {
 		err := ks.eventBus.Publish(event.NewKeyStoreEvent())
 		if err != nil {
-			fmt.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
+			log.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
 		}
 	}()
 	return nil
@@ -97,7 +97,7 @@ func (ks *KmsKeyStore) AddKeys(keys map[uuid.UUID][]byte) error {
 	go func() {
 		err := ks.eventBus.Publish(event.NewKeyStoreEvent())
 		if err != nil {
-			fmt.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
+			log.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
 		}
 	}()
 	return nil
@@ -142,7 +142,7 @@ func (ks *KmsKeyStore) DeleteKey(keyId uuid.UUID) {
 	go func() {
 		err := ks.eventBus.Publish(event.NewKeyStoreEvent())
 		if err != nil {
-			fmt.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
+			log.Errorf("Publishing a key store update through the eventBus failed, err: %w", err)
 		}
 	}()
 }