diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index b337c3bab..d19ac0bca 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -404,6 +404,7 @@ export class ComBattleHandler {
         let roleId = session.get('roleId');
         let { teamCode } = msg;
         let teamStatus = this.teamMap.get(teamCode);
+        if(!teamStatus) return resResult(STATUS.SUCCESS);
         let channelService = this.app.get('channelService');
         let channel = channelService.getChannel(teamCode, false);
         let result = await dismissTeam(teamStatus, this.teamMap, roleId, this.teamDisTimer, channel);
diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts
index bbf0d0607..56901dafc 100644
--- a/game-server/app/servers/role/handler/friendHandler.ts
+++ b/game-server/app/servers/role/handler/friendHandler.ts
@@ -431,7 +431,7 @@ export class FriendHandler {
         // 任务
         await checkTaskWithRoles(serverId, roleId, sid, TASK_TYPE.FRIEND_NUM, [role, friend]);
         await checkActivityTask(serverId, sid, role.roleId, TASK_TYPE.FRIEND_NUM, role.friendCnt);
-        await checkActivityTask(serverId, null, friend.roleId, TASK_TYPE.FRIEND_NUM, friend.friendCnt);
+        if(friend) await checkActivityTask(serverId, null, friend.roleId, TASK_TYPE.FRIEND_NUM, friend.friendCnt);
 
         return resResult(STATUS.SUCCESS, {
             frdRoleIds, blackRoleIds,