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