2 files changed, 7 insertions, 0 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 177b3a023..ead22a984 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -100,6 +100,11 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
         localPlayer->stopAttack();
 
     Game *const game = Game::instance();
+    if (!game)
+    {
+        BLOCK_END("PlayerHandler::processPlayerWarp")
+        return;
+    }
 
     const std::string &currentMapName = game->getCurrentMapName();
     const bool sameMap = (currentMapName == mapPath);
diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp
index d813b6551..8b0103bab 100644
--- a/src/net/eathena/pethandler.cpp
+++ b/src/net/eathena/pethandler.cpp
@@ -202,6 +202,8 @@ void PetHandler::processEggsList(Net::MessageIn &msg)
 {
     const int count = (msg.readInt16("len") - 4) / 2;
     Inventory *const inv = PlayerInfo::getInventory();
+    if (!inv)
+        return;
     menu = MenuType::Eggs;
 
     if (count == 1)