diff --git a/mqtt_client.c b/mqtt_client.c
index f3eda2b..62d5d46 100644
--- a/mqtt_client.c
+++ b/mqtt_client.c
@@ -934,18 +934,27 @@ esp_err_t esp_mqtt_client_set_uri(esp_mqtt_client_handle_t client, const char *u
     client->config->path = NULL;
 
     if (puri.field_data[UF_PATH].len || puri.field_data[UF_QUERY].len) {
+        int asprintf_ret_value;
         if (puri.field_data[UF_QUERY].len == 0) {
-            asprintf(&client->config->path, "%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off);
+            asprintf_ret_value = asprintf(&client->config->path,
+                    "%.*s",
+                    puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off);
         } else if (puri.field_data[UF_PATH].len == 0)  {
-            asprintf(&client->config->path, "/?%.*s", puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
+            asprintf_ret_value = asprintf(&client->config->path,
+                    "/?%.*s",
+                    puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
         } else {
-            asprintf(&client->config->path, "%.*s?%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off,
-                     puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
+            asprintf_ret_value = asprintf(&client->config->path,
+                    "%.*s?%.*s",
+                    puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off,
+                    puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
         }
-        ESP_MEM_CHECK(TAG, client->config->path, {
+
+        if (asprintf_ret_value == -1) {
+            ESP_LOGE(TAG,"%s(%d): %s",  __FUNCTION__, __LINE__, "Memory exhausted");
             MQTT_API_UNLOCK(client);
             return ESP_ERR_NO_MEM;
-        });
+        }
     }
 
     if (puri.field_data[UF_PORT].len) {