diff --git a/src/plugins/chat/message_base.py b/src/plugins/chat/message_base.py
index d17c2c357..334859e5b 100644
--- a/src/plugins/chat/message_base.py
+++ b/src/plugins/chat/message_base.py
@@ -65,6 +65,8 @@ class GroupInfo:
         Returns:
             GroupInfo: 新的实例
         """
+        if data.get('group_id') is None:
+            return None
         return cls(
             platform=data.get('platform'),
             group_id=data.get('group_id'),
@@ -129,8 +131,8 @@ class BaseMessageInfo:
         Returns:
             BaseMessageInfo: 新的实例
         """
-        group_info = GroupInfo(**data.get('group_info', {}))
-        user_info = UserInfo(**data.get('user_info', {}))
+        group_info = GroupInfo.from_dict(data.get('group_info', {}))
+        user_info = UserInfo.from_dict(data.get('user_info', {}))
         return cls(
             platform=data.get('platform'),
             message_id=data.get('message_id'),
@@ -173,7 +175,7 @@ class MessageBase:
         Returns:
             MessageBase: 新的实例
         """
-        message_info = BaseMessageInfo(**data.get('message_info', {}))
+        message_info = BaseMessageInfo.from_dict(data.get('message_info', {}))
         message_segment = Seg(**data.get('message_segment', {}))
         raw_message = data.get('raw_message',None)
         return cls(
diff --git a/src/plugins/chat/message_cq.py b/src/plugins/chat/message_cq.py
index 6bfa47c3f..aa82d8822 100644
--- a/src/plugins/chat/message_cq.py
+++ b/src/plugins/chat/message_cq.py
@@ -62,7 +62,7 @@ class MessageRecvCQ(MessageCQ):
         # 调用父类初始化
         super().__init__(message_id, user_info, group_info, platform)
 
-        if group_info.group_name is None:
+        if group_info and group_info.group_name is None:
             group_info.group_name = get_groupname(group_info.group_id)
         
         # 解析消息段