diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 3dfa32ccc54f324ccb6d88499046592ef97411ac..3a9858f418578975076e77ae18844f4e77ce10db 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -359,14 +359,14 @@ size_t blockDataGetNumOfCols(const SSDataBlock* pBlock) { return taosArrayGetSiz
 size_t blockDataGetNumOfRows(const SSDataBlock* pBlock) { return pBlock->info.rows; }
 
 int32_t blockDataUpdateTsWindow(SSDataBlock* pDataBlock, int32_t tsColumnIndex) {
-  if (pDataBlock->info.rows > 0) {
-    //    ASSERT(pDataBlock->info.dataLoad == 1);
-  }
-
   if (pDataBlock == NULL || pDataBlock->info.rows <= 0 || pDataBlock->info.dataLoad == 0) {
     return 0;
   }
 
+  if (pDataBlock->info.rows > 0) {
+    //    ASSERT(pDataBlock->info.dataLoad == 1);
+  }
+
   size_t numOfCols = taosArrayGetSize(pDataBlock->pDataBlock);
   if (numOfCols <= 0) {
     return -1;
diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index 5d19012273aca3bf48ba37159e016290947fc49f..5e001a96872306d9369d388f8823a2baecdbf04f 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -903,9 +903,7 @@ static int32_t tRowAppendTupleToColData(SRow *pRow, STSchema *pTSchema, SColData
   int32_t   iTColumn = 1;
   STColumn *pTColumn = &pTSchema->columns[iTColumn];
 
-  uint8_t *pb = NULL;
-  uint8_t *pf;
-  uint8_t *pv;
+  uint8_t *pb = NULL, *pf = NULL, *pv = NULL;
 
   switch (pRow->flag) {
     case HAS_VALUE:
diff --git a/source/common/src/trow.c b/source/common/src/trow.c
index ca2c0567439f22bcc77e23ae69065f065a275764..00a4664c2c0e3f36126a348e783dc6be4bbed719 100644
--- a/source/common/src/trow.c
+++ b/source/common/src/trow.c
@@ -342,7 +342,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
     }
 
     if (iColumn == 0) {
-      ASSERT(pColVal->cid == pTColumn->colId);
+      ASSERT(pColVal && pColVal->cid == pTColumn->colId);
       ASSERT(pTColumn->type == TSDB_DATA_TYPE_TIMESTAMP);
       ASSERT(pTColumn->colId == PRIMARYKEY_TIMESTAMP_COL_ID);
     } else {
diff --git a/source/libs/function/src/tpercentile.c b/source/libs/function/src/tpercentile.c
index 157ee08f1522118e0ab12daa5426c1f44c00adda..316eaba088069143646412f7bc44c7c7181adea7 100644
--- a/source/libs/function/src/tpercentile.c
+++ b/source/libs/function/src/tpercentile.c
@@ -33,7 +33,14 @@ static SFilePage *loadDataFromFilePage(tMemBucket *pMemBucket, int32_t slotIdx)
       (SFilePage *)taosMemoryCalloc(1, pMemBucket->bytes * pMemBucket->pSlots[slotIdx].info.size + sizeof(SFilePage));
 
   int32_t groupId = getGroupId(pMemBucket->numOfSlots, slotIdx, pMemBucket->times);
-  SArray *pIdList = *(SArray **)taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+
+  SArray *pIdList;
+  void *p = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+  if (p != NULL) {
+    pIdList = *(SArray **)p;
+  } else {
+    return NULL;
+  }
 
   int32_t offset = 0;
   for (int32_t i = 0; i < taosArrayGetSize(pIdList); ++i) {
@@ -498,8 +505,17 @@ double getPercentileImpl(tMemBucket *pMemBucket, int32_t count, double fraction)
         resetSlotInfo(pMemBucket);
 
         int32_t groupId = getGroupId(pMemBucket->numOfSlots, i, pMemBucket->times - 1);
-        SArray* list = *(SArray **)taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
-        ASSERT(list != NULL && list->size > 0);
+
+        SArray* list;
+        void *p = taosHashGet(pMemBucket->groupPagesMap, &groupId, sizeof(groupId));
+        if (p != NULL) {
+          list = *(SArray **)p;
+          if (list == NULL || list->size <= 0) {
+            return -1;
+          }
+        } else {
+          return -1;
+        }
 
         for (int32_t f = 0; f < list->size; ++f) {
           int32_t *pageId = taosArrayGet(list, f);