diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 1837412..f5f9cfd 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -134,7 +134,7 @@ Player* Room::GetPlayerByAccountId(const std::string& accountid)
 Player* Room::GetPlayerByUniId(int uniid)
 {
     Entity* entity = GetEntityByUniId(uniid);
-    return entity->entity_type == ET_Player && entity->entity_subtype == EST_Player ? (Player*)entity : nullptr;
+    return entity && entity->entity_type == ET_Player && entity->entity_subtype == EST_Player ? (Player*)entity : nullptr;
 }
 
 Entity* Room::GetEntityByUniId(int uniid)