diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 00a97d7bc2474e31931e07edfdc4df617578e531..1f680026b541099ba22dda632cb5d1524e03219c 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -631,15 +631,19 @@ static void rpcReleaseConn(SRpcConn *pConn) {
     // if there is an outgoing message, free it
     if (pConn->outType && pConn->pReqMsg) {
       SRpcReqContext *pContext = pConn->pContext;
-      if (pContext->pRsp) {   
+      if (pContext) {
+        if (pContext->pRsp) {   
         // for synchronous API, post semaphore to unblock app
-        pContext->pRsp->code = TSDB_CODE_RPC_APP_ERROR;
-        pContext->pRsp->pCont = NULL;
-        pContext->pRsp->contLen = 0;
-        tsem_post(pContext->pSem);
+          pContext->pRsp->code = TSDB_CODE_RPC_APP_ERROR;
+          pContext->pRsp->pCont = NULL;
+          pContext->pRsp->contLen = 0;
+          tsem_post(pContext->pSem);
+        }
+        pContext->pConn = NULL; 
+        taosRemoveRef(tsRpcRefId, pContext->rid);
+      } else {
+        assert(0); 
       }
-      pContext->pConn = NULL; 
-      taosRemoveRef(tsRpcRefId, pContext->rid);
     }
   }
 
@@ -1083,7 +1087,11 @@ static void *rpcProcessMsgFromPeer(SRecvInfo *pRecv) {
         if (code == TSDB_CODE_RPC_INVALID_TIME_STAMP || code == TSDB_CODE_RPC_AUTH_FAILURE) {
           rpcCloseConn(pConn);
         }
-        tDebug("%s %p %p, %s is sent with error code:0x%x", pRpc->label, pConn, (void *)pHead->ahandle, taosMsg[pHead->msgType+1], code);
+        if (pHead->msgType + 1 > 1 && pHead->msgType+1 < TSDB_MSG_TYPE_MAX) {
+          tDebug("%s %p %p, %s is sent with error code:0x%x", pRpc->label, pConn, (void *)pHead->ahandle, taosMsg[pHead->msgType+1], code);
+        } else {
+          tError("%s %p %p, %s is sent with error code:0x%x", pRpc->label, pConn, (void *)pHead->ahandle, taosMsg[pHead->msgType], code);
+        }     
       } 
     } else { // msg is passed to app only parsing is ok 
 
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index 2850046d050cba4adceeac615c0672d36dfed7d9..178b96c423641ccc6be84c57ca71fe7b85fd7a33 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -242,7 +242,14 @@ static void *taosAcceptTcpConnection(void *arg) {
 
     taosKeepTcpAlive(connFd);
     struct timeval to={1, 0};
-    taosSetSockOpt(connFd, SOL_SOCKET, SO_RCVTIMEO, &to, sizeof(to));
+    int32_t ret = taosSetSockOpt(connFd, SOL_SOCKET, SO_RCVTIMEO, &to, sizeof(to));
+    if (ret != 0) {
+      taosCloseSocket(connFd);
+      tError("%s failed to set recv timeout fd(%s)for connection from:%s:%hu", pServerObj->label, strerror(errno),
+             taosInetNtoa(caddr.sin_addr), htons(caddr.sin_port));
+      continue;
+    }
+    
 
     // pick up the thread to handle this connection
     pThreadObj = pServerObj->pThreadObj[threadId];
diff --git a/src/rpc/test/rclient.c b/src/rpc/test/rclient.c
index 5721525adee3fc847a1ba2476ccb0995fb50a65c..faa6d40da398045e43dba3bbdbaf9ef6c7ccb1ff 100644
--- a/src/rpc/test/rclient.c
+++ b/src/rpc/test/rclient.c
@@ -188,7 +188,8 @@ int main(int argc, char *argv[]) {
   tInfo("it takes %.3f mseconds to send %d requests to server", usedTime, numOfReqs*appThreads);
   tInfo("Performance: %.3f requests per second, msgSize:%d bytes", 1000.0*numOfReqs*appThreads/usedTime, msgSize);
 
-  getchar();
+  int ch = getchar();
+  UNUSED(ch); 
 
   taosCloseLog();