diff --git a/handler/handler.go b/handler/handler.go
index b60a788552d01bf916d9670b21dd2c69546409f6..6d653406d20119ac159fa887f3f60afe9691c302 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -246,10 +246,12 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 		keyID := string(response.Data.Data)
 		keyIdResponse.KeyId = keyID
 		return keyIdResponse, nil
-	}
-
-	if err != nil {
-		return nil, err
+	} else {
+		if err != nil {
+			return nil, err
+		} else {
+			return nil, errors.New("Can not get public key")
+		}
 	}
 
 	entity, err := clientutils.GetLastEntity(entitiesMagamentClient, in.EntityUUID)