diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java
index fbe380dc1..c03f8f2f6 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/mapper/BaseMapper.java
@@ -113,10 +113,6 @@ public abstract class BaseMapper implements SchemaMapper {
         if (!existElement.equals(newElement)) {
             return false;
         }
-        if (SchemaElementType.TERM.equals(existElement.getType())
-                && SchemaElementType.TERM.equals(newElement.getType())) {
-            return false;
-        }
         if (SchemaElementType.VALUE.equals(newElement.getType())) {
             return existElementMatch.getWord().equalsIgnoreCase(newElementMatch.getWord());
         }
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/S2ChatModelProvider.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/S2ChatModelProvider.java
index eed8041fe..23b82204c 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/S2ChatModelProvider.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/S2ChatModelProvider.java
@@ -13,7 +13,7 @@ public class S2ChatModelProvider {
 
     public static ChatLanguageModel provide(LLMConfig llmConfig) {
         ChatLanguageModel chatLanguageModel = ContextUtils.getBean(ChatLanguageModel.class);
-        if (StringUtils.isBlank(llmConfig.getProvider())
+        if (llmConfig == null || StringUtils.isBlank(llmConfig.getProvider())
                 || StringUtils.isBlank(llmConfig.getBaseUrl())) {
             return chatLanguageModel;
         }