diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/HanlpDictMatchStrategy.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/HanlpDictMatchStrategy.java
index 29a29b9b8..4ed47462f 100644
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/HanlpDictMatchStrategy.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/HanlpDictMatchStrategy.java
@@ -55,7 +55,8 @@ public class HanlpDictMatchStrategy extends SingleMatchStrategy<HanlpMapResult>
         // higher-similarity records are inserted first and survive LinkedHashSet dedup
         hanlpMapResults = hanlpMapResults.stream()
                 .sorted(Comparator.comparingDouble(HanlpMapResult::getSimilarity).reversed()
-                        .thenComparing((a, b) -> Integer.compare(b.getName().length(), a.getName().length())))
+                        .thenComparing((a, b) -> Integer.compare(b.getName().length(),
+                                a.getName().length())))
                 .collect(Collectors.toCollection(LinkedHashSet::new));
 
         // step4. filter by similarity
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java
index 952996424..3b8dcd356 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java
@@ -123,8 +123,10 @@ public class DataSetSchemaBuilder {
                 dimToAdd.getExtInfo().put(DimensionConstants.DIMENSION_DATA_TYPE,
                         dim.getDataType());
             } else {
-                dimToAdd.getExtInfo().put(DimensionConstants.DIMENSION_DATA_TYPE,
-                        dataTypeMap.get(dim.getModelId()).get(dim.getBizName()));
+                if (dataTypeMap.containsKey(dim.getModelId())) {
+                    dimToAdd.getExtInfo().put(DimensionConstants.DIMENSION_DATA_TYPE,
+                            dataTypeMap.get(dim.getModelId()).get(dim.getBizName()));
+                }
             }
             if (dim.isTimeDimension()) {
                 String timeFormat =