diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 3343f0a0caaf5becb305fc34327bf8af54d012c3..16b40f54bd0d2f9c040f6a0e76bb3ff5991f8497 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2071,8 +2071,7 @@ int tscProcessSTableVgroupRsp(SSqlObj *pSql) {
 
     pInfo->vgroupList->numOfVgroups = pVgroupMsg->numOfVgroups;
     if (pInfo->vgroupList->numOfVgroups <= 0) {
-      //tfree(pInfo->vgroupList);
-      tscError("0x%"PRIx64" empty vgroup info", pSql->self);
+      tscDebug("0x%"PRIx64" empty vgroup info, no corresponding tables for stable", pSql->self);
     } else {
       for (int32_t j = 0; j < pInfo->vgroupList->numOfVgroups; ++j) {
         // just init, no need to lock
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 14683090e661e68b71fe9ae65ecc4c84f4d13b25..a734023728d87dc0f712d010f9206948ebc3450d 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -84,13 +84,18 @@ static bool allSubqueryDone(SSqlObj *pParentSql) {
   //lock in caller
   tscDebug("0x%"PRIx64" total subqueries: %d", pParentSql->self, subState->numOfSub);
   for (int i = 0; i < subState->numOfSub; i++) {
+    SSqlObj* pSub = pParentSql->pSubs[i];
     if (0 == subState->states[i]) {
       tscDebug("0x%"PRIx64" subquery:0x%"PRIx64", index: %d NOT finished, abort query completion check", pParentSql->self,
-          pParentSql->pSubs[i]->self, i);
+               pSub->self, i);
       done = false;
       break;
     } else {
-      tscDebug("0x%"PRIx64" subquery:0x%"PRIx64", index: %d finished", pParentSql->self, pParentSql->pSubs[i]->self, i);
+      if (pSub != NULL) {
+        tscDebug("0x%"PRIx64" subquery:0x%"PRIx64", index: %d finished", pParentSql->self, pSub->self, i);
+      } else {
+        tscDebug("0x%"PRIx64" subquery:%p, index: %d finished", pParentSql->self, pSub, i);
+      }
     }
   }