1 files changed, 8 insertions, 4 deletions
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 2db9527a3..b892e152a 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -50,10 +50,12 @@ NpcHandler::NpcHandler() :
     npcHandler = this;
 }
 
-void NpcHandler::talk(const BeingId npcId) const
+void NpcHandler::talk(const Being *const being) const
 {
+    if (!being)
+        return;
     createOutPacket(CMSG_NPC_TALK);
-    outMsg.writeBeingId(npcId, "npc id");
+    outMsg.writeBeingId(being->getId(), "npc id");
     outMsg.writeInt8(0, "unused");
 }
 
@@ -106,10 +108,12 @@ void NpcHandler::stringInput(const BeingId npcId,
     outMsg.writeInt8(0, "null byte");
 }
 
-void NpcHandler::buy(const BeingId beingId) const
+void NpcHandler::buy(const Being *const being) const
 {
+    if (!being)
+        return;
     createOutPacket(CMSG_NPC_BUY_SELL_REQUEST);
-    outMsg.writeBeingId(beingId, "npc id");
+    outMsg.writeBeingId(being->getId(), "npc id");
     outMsg.writeInt8(0, "action");
 }