diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts
index 6062bba55..a77f1e9b0 100644
--- a/game-server/app/services/guildActivity/guildActivityService.ts
+++ b/game-server/app/services/guildActivity/guildActivityService.ts
@@ -893,7 +893,9 @@ export async function debugResetJoin(serverId: number) {
             let { code: sourceCode } = guildActivityRec;
             let myGuildActivityRec = await UserGuildActivityRecModel.getRecord(roleId, roleName, guildCode, serverId, sourceCode, GUILD_ACTIVITY_TYPE.RACE_ACTIVITY);
             let myGuild = await UserGuildModel.getMyGuild(roleId, 'job');
-            let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, '', myGuild.job, myGuildActivityRec.code);            
+            if(myGuild) {
+                let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, '', myGuild.job, myGuildActivityRec.code);            
+            }
     
         }
     }
diff --git a/game-server/app/services/redisService.ts b/game-server/app/services/redisService.ts
index c5b23695c..9a75fac12 100644
--- a/game-server/app/services/redisService.ts
+++ b/game-server/app/services/redisService.ts
@@ -366,7 +366,7 @@ export async function roleLeave(roleId: string) {
     if(count <= 0) {
         await redisClient().hdelAsync(REDIS_KEY.ONLINE_CNT, roleId);
         await redisClient().hdelAsync(REDIS_KEY.ONLINE_USERS, roleId);
-        await redisClient().hdelAsync(REDIS_KEY.USER_CODE, role.userCode);
+        if(role) await redisClient().hdelAsync(REDIS_KEY.USER_CODE, role.userCode);
         await redisClient().hdelAsync(REDIS_KEY.ONLINE_CNT, roleId);
     }
     return role;