diff --git a/source/dnode/mnode/impl/src/mndAnode.c b/source/dnode/mnode/impl/src/mndAnode.c
index e41e7170a3..c64208600a 100644
--- a/source/dnode/mnode/impl/src/mndAnode.c
+++ b/source/dnode/mnode/impl/src/mndAnode.c
@@ -491,23 +491,24 @@ static int32_t mndSetDropAnodeRedoLogs(STrans *pTrans, SAnodeObj *pObj) {
   int32_t  code = 0;
   SSdbRaw *pRedoRaw = mndAnodeActionEncode(pObj);
   if (pRedoRaw == NULL) {
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    TAOS_RETURN(code);
+    code = terrno;
+    return code;
   }
+
   TAOS_CHECK_RETURN(mndTransAppendRedolog(pTrans, pRedoRaw));
   TAOS_CHECK_RETURN(sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPING));
-  TAOS_RETURN(code);
+
+  return code;
 }
 
 static int32_t mndSetDropAnodeCommitLogs(STrans *pTrans, SAnodeObj *pObj) {
   int32_t  code = 0;
   SSdbRaw *pCommitRaw = mndAnodeActionEncode(pObj);
   if (pCommitRaw == NULL) {
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    TAOS_RETURN(code);
+    code = terrno;
+    return code;
   }
+
   TAOS_CHECK_RETURN(mndTransAppendCommitlog(pTrans, pCommitRaw));
   TAOS_CHECK_RETURN(sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED));
   TAOS_RETURN(code);
@@ -521,25 +522,25 @@ static int32_t mndSetDropAnodeInfoToTrans(SMnode *pMnode, STrans *pTrans, SAnode
 }
 
 static int32_t mndDropAnode(SMnode *pMnode, SRpcMsg *pReq, SAnodeObj *pObj) {
-  int32_t code = -1;
+  int32_t code = 0;
+  int32_t lino = 0;
 
   STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_NOTHING, pReq, "drop-anode");
-  if (pTrans == NULL) {
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
-    goto _OVER;
-  }
+  TSDB_CHECK_NULL(pTrans, code, lino, _OVER, terrno);
+
   mndTransSetSerial(pTrans);
+  mInfo("trans:%d, to drop anode:%d", pTrans->id, pObj->id);
 
-  mInfo("trans:%d, used to drop anode:%d", pTrans->id, pObj->id);
-  TAOS_CHECK_GOTO(mndSetDropAnodeInfoToTrans(pMnode, pTrans, pObj, false), NULL, _OVER);
-  TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _OVER);
+  code = mndSetDropAnodeInfoToTrans(pMnode, pTrans, pObj, false);
+  mndReleaseAnode(pMnode, pObj);
 
-  code = 0;
+  TSDB_CHECK_CODE(code, lino, _OVER);
+
+  code = mndTransPrepare(pMnode, pTrans);
 
 _OVER:
   mndTransDrop(pTrans);
-  TAOS_RETURN(code);
+  return code;
 }
 
 static int32_t mndProcessDropAnodeReq(SRpcMsg *pReq) {
@@ -560,20 +561,20 @@ static int32_t mndProcessDropAnodeReq(SRpcMsg *pReq) {
 
   pObj = mndAcquireAnode(pMnode, dropReq.anodeId);
   if (pObj == NULL) {
-    code = TSDB_CODE_MND_RETURN_VALUE_NULL;
-    if (terrno != 0) code = terrno;
+    code = terrno;
     goto _OVER;
   }
 
   code = mndDropAnode(pMnode, pReq, pObj);
-  if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS;
+  if (code == 0) {
+    code = TSDB_CODE_ACTION_IN_PROGRESS;
+  }
 
 _OVER:
   if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
     mError("anode:%d, failed to drop since %s", dropReq.anodeId, tstrerror(code));
   }
 
-  mndReleaseAnode(pMnode, pObj);
   tFreeSMDropAnodeReq(&dropReq);
   TAOS_RETURN(code);
 }
diff --git a/source/libs/executor/src/anomalywindowoperator.c b/source/libs/executor/src/anomalywindowoperator.c
index f7b87b98b9..3bc9c806b0 100644
--- a/source/libs/executor/src/anomalywindowoperator.c
+++ b/source/libs/executor/src/anomalywindowoperator.c
@@ -301,8 +301,13 @@ static int32_t anomalyParseJson(SJson* pJson, SArray* pWindows, const char* pId)
 
   if (rows < 0) {
     char pMsg[1024] = {0};
-    tjsonGetStringValue(pJson, "msg", pMsg);
-    qError("%s failed to exec forecast, msg:%s", pId, pMsg);
+    code = tjsonGetStringValue(pJson, "msg", pMsg);
+    if (code) {
+      qError("%s failed to get error msg from rsp, unknown error", pId);
+    } else {
+      qError("%s failed to exec forecast, msg:%s", pId, pMsg);
+    }
+
     return TSDB_CODE_ANA_WN_DATA;
   } else if (rows == 0) {
     return TSDB_CODE_SUCCESS;
diff --git a/source/libs/executor/src/forecastoperator.c b/source/libs/executor/src/forecastoperator.c
index 9ad9950bdb..fc11f70277 100644
--- a/source/libs/executor/src/forecastoperator.c
+++ b/source/libs/executor/src/forecastoperator.c
@@ -210,8 +210,12 @@ static int32_t forecastAnalysis(SForecastSupp* pSupp, SSDataBlock* pBlock, const
   tjsonGetInt32ValueFromDouble(pJson, "rows", rows, code);
   if (rows < 0 && code == 0) {
     char pMsg[1024] = {0};
-    tjsonGetStringValue(pJson, "msg", pMsg);
-    qError("%s failed to exec forecast, msg:%s", pId, pMsg);
+    code = tjsonGetStringValue(pJson, "msg", pMsg);
+    if (code != 0) {
+      qError("%s failed to get msg from rsp, unknown error", pId);
+    } else {
+      qError("%s failed to exec forecast, msg:%s", pId, pMsg);
+    }
 
     tjsonDelete(pJson);
     return TSDB_CODE_ANA_WN_DATA;