diff --git a/source/libs/executor/src/exchangeoperator.c b/source/libs/executor/src/exchangeoperator.c
index 78c0d939ad..5afae596a4 100644
--- a/source/libs/executor/src/exchangeoperator.c
+++ b/source/libs/executor/src/exchangeoperator.c
@@ -390,11 +390,13 @@ static int32_t initExchangeOperator(SExchangePhysiNode* pExNode, SExchangeInfo*
   }
 
   initLimitInfo(pExNode->node.pLimit, pExNode->node.pSlimit, &pInfo->limitInfo);
-  pInfo->self = taosAddRef(exchangeObjRefPool, pInfo);
-  if (pInfo->self < 0) {
+  int64_t refId = taosAddRef(exchangeObjRefPool, pInfo);
+  if (refId < 0) {
     int32_t code = terrno;
     qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
     return code;
+  } else {
+    pInfo->self = refId;
   }
 
   return initDataSource(numOfSources, pInfo, id);
diff --git a/source/libs/executor/src/tfill.c b/source/libs/executor/src/tfill.c
index 3158c85987..957a5d1d2e 100644
--- a/source/libs/executor/src/tfill.c
+++ b/source/libs/executor/src/tfill.c
@@ -758,7 +758,10 @@ SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfFillExpr, SExprIn
 
       SValueNode* pv = (SValueNode*)nodesListGetNode(pValNode->pNodeList, index);
       QUERY_CHECK_NULL(pv, code, lino, _end, terrno);
-      nodesValueNodeToVariant(pv, &pFillCol[i].fillVal);
+      code = nodesValueNodeToVariant(pv, &pFillCol[i].fillVal);
+    }
+    if (TSDB_CODE_SUCCESS != code) {
+      goto _end;
     }
   }
   pFillCol->numOfFillExpr = numOfFillExpr;