diff --git a/handler/handler.go b/handler/handler.go
index b6323d7a499f0bfbc8a8fb4051b93fd6393fc36a..9683506e1b9f61360c6c6c0d9d69f3e2b87af438 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -246,6 +246,10 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 		return keyIdResponse, nil
 	}
 
+	if err != nil {
+		return nil, err
+	}
+
 	entity, err := clientutils.GetLastEntity(entitiesMagamentClient, in.EntityUUID)
 
 	if err != nil {