diff --git a/utils/utils.go b/utils/utils.go
index d4fb92d316a351d9985a87b5995c85faa08caf9d..f74eed36f26c836cd1c8cd0f6c1d9daa24fa138f 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -46,8 +46,8 @@ func GenerateUnusedUUID(client *client.DataStorageClientImpl) (string, error) {
 		// check that uuid is not used
 		key := &api.Key{}
 
-		hasData, errorsString, err := client.GetData("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE), key)
-		if err != nil && errorsString != "" && !hasData {
+		hasData, _, err := client.GetData("keys", uuid+"/"+api.KeyType.String(api.KeyType_PRIVATE), key)
+		if err != nil || !hasData {
 			return uuid, nil
 		}
 		if count >= 10 {