diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 227f89b6058698038396690ab363a7a19a24685b..4c2c8bde79940bdf0369f29c2ae5b8d988a2c3b6 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -441,7 +441,12 @@ int tscSendMsgToServer(SSqlObj *pSql) {
       .code    = 0
   };
   
-  rpcSendRequest(pObj->pRpcObj->pDnodeConn, &pSql->epSet, &rpcMsg, &pSql->rpcRid);
+  if(rpcSendRequest(pObj->pRpcObj->pDnodeConn, &pSql->epSet, &rpcMsg, &pSql->rpcRid)) {
+    if(pSql->cmd.command < TSDB_SQL_HB)
+      rpcSaveSendInfo(pSql->rpcRid, &pSql->pPrevContext);
+    return TSDB_CODE_SUCCESS;
+  }
+
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index aefec7dc9df032f16639fe415a0541e57b93fa3a..ad11a50e033e6d577dbeeda5b0fec5414820cd01 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -3393,6 +3393,10 @@ static void doFreeInsertSupporter(SSqlObj* pSqlObj) {
 }
 
 static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows) {
+  if(param == NULL) {
+    tscError("callback multiVnodeInsertFinalize param is NULL. tres=%p numOfRows=%d", tres, numOfRows);
+    return ;
+  }
   SInsertSupporter *pSupporter = (SInsertSupporter *)param;
   SSqlObj* pParentObj = pSupporter->pSql;