diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index c57fd388ee051e88b014309270e756626b5fa730..592deb3272c0db7d41a579c54b70d23207b14419 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -789,7 +789,10 @@ int tscBuildAndSendRequest(SSqlObj *pSql, SQueryInfo* pQueryInfo) {
 
 int tscBuildFetchMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SRetrieveTableMsg *pRetrieveMsg = (SRetrieveTableMsg *) pSql->cmd.payload;
-
+  if (NULL == pRetrieveMsg) {
+    return TSDB_CODE_TSC_APP_ERROR;
+  }
+  
   SQueryInfo *pQueryInfo = tscGetQueryInfo(&pSql->cmd);
 
   pRetrieveMsg->free = htons(pQueryInfo->type);
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 7dd1c71fb69b94d95d83a0a9fd782a802b74724f..cf50179467dd97a061717bf686fed44cb1fff28c 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -628,7 +628,7 @@ static bool tscKillQueryInDnode(SSqlObj* pSql) {
   SSqlCmd* pCmd = &pSql->cmd;
   SSqlRes* pRes = &pSql->res;
 
-  if (pRes == NULL || pRes->qId == 0) {
+  if (pRes == NULL || pRes->qId == 0 || (pRes->qId == 0x1 && pCmd->payloadLen == 0)) {
     return true;
   }