5 files changed, 10 insertions, 37 deletions
diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp
index 586e276b8..7522ec491 100644
--- a/src/net/eathena/auctionhandler.cpp
+++ b/src/net/eathena/auctionhandler.cpp
@@ -139,6 +139,8 @@ void AuctionHandler::cancelReg() const
 void AuctionHandler::setItem(const Item *const item,
                              const int amount) const
 {
+    if (!item)
+        return;
     createOutPacket(CMSG_AUCTION_SET_ITEM);
     outMsg.writeInt16(static_cast<int16_t>(
         item->getInvIndex() + INVENTORY_OFFSET), "index");
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 10161d922..26e78cd84 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -479,6 +479,8 @@ Being *BeingHandler::createBeing2(Net::MessageIn &msg,
 
 void BeingHandler::undress(Being *const being) const
 {
+    if (!being)
+        return;
     being->setSprite(SPRITE_WEAPON, 0);
     being->setSprite(SPRITE_HEAD_BOTTOM, 0);
     being->setSprite(SPRITE_CLOTHES_COLOR, 0);
@@ -1507,37 +1509,6 @@ void BeingHandler::processBeingSoundEffect(Net::MessageIn &msg)
     msg.readInt32("source being id");
 }
 
-void BeingHandler::applyPlayerAction(Net::MessageIn &msg,
-                                     Being *const being,
-                                     const uint8_t type)
-{
-    switch (type)
-    {
-        case 0:
-            being->setAction(BeingAction::STAND, 0);
-            localPlayer->imitateAction(being, BeingAction::STAND);
-            break;
-
-        case 1:
-            if (being->getCurrentAction() != BeingAction::DEAD)
-            {
-                being->setAction(BeingAction::DEAD, 0);
-                being->recalcSpritesOrder();
-            }
-            break;
-
-        case 2:
-            being->setAction(BeingAction::SIT, 0);
-            localPlayer->imitateAction(being, BeingAction::SIT);
-            break;
-
-        default:
-            // need set stand state?
-            UNIMPLIMENTEDPACKET;
-            break;
-    }
-}
-
 void BeingHandler::viewPlayerEquipment(const Being *const being)
 {
     if (!being)
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index ba8cf5ce7..cb8707218 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -86,7 +86,7 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
                                                    Being *const dstBeing,
                                                    const uint8_t type,
                                                    const int id,
-                                                   const int id2);
+                                                   const int id2) A_NONNULL(2);
 
         static void processBeingSpecialEffect(Net::MessageIn &msg);
 
@@ -94,10 +94,6 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
 
         static void processBeingSoundEffect(Net::MessageIn &msg);
 
-        static void applyPlayerAction(Net::MessageIn &msg,
-                                      Being *const being,
-                                      const uint8_t type);
-
         void viewPlayerEquipment(const Being *const being);
 
         static void processSkillGroundNoDamage(Net::MessageIn &msg);
diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp
index 9a9bfe728..f317cd712 100644
--- a/src/net/eathena/buyingstorehandler.cpp
+++ b/src/net/eathena/buyingstorehandler.cpp
@@ -327,7 +327,7 @@ void BuyingStoreHandler::sell(const Being *const being,
                               const Item *const item,
                               const int amount) const
 {
-    if (!being)
+    if (!being || !item)
         return;
 
     createOutPacket(CMSG_BUYINGSTORE_SELL);
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 8406575bd..0e90235f6 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -406,6 +406,8 @@ void InventoryHandler::insertCard(const int cardIndex,
 void InventoryHandler::favoriteItem(const Item *const item,
                                     const bool favorite) const
 {
+    if (!item)
+        return;
     createOutPacket(CMSG_PLAYER_FAVORITE_ITEM);
     outMsg.writeInt16(static_cast<int16_t>(item->getInvIndex()
         + INVENTORY_OFFSET),
@@ -802,6 +804,8 @@ void InventoryHandler::processPlayerInsertCard(Net::MessageIn &msg)
 
 void InventoryHandler::selectEgg(const Item *const item) const
 {
+    if (!item)
+        return;
     createOutPacket(CMSG_PET_SELECT_EGG);
     outMsg.writeInt16(static_cast<int16_t>(
         item->getInvIndex() + INVENTORY_OFFSET), "index");