2 files changed, 4 insertions, 0 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 3d7e4f6a7..1a80b2c89 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -433,8 +433,11 @@ void BeingHandler::processNameResponse(Net::MessageIn &msg) const
                 }
                 localPlayer->checkNewName(dstBeing);
             }
+            BLOCK_END("BeingHandler::processNameResponse")
+            return;
         }
     }
+    msg.readString(24, "name");
     BLOCK_END("BeingHandler::processNameResponse")
 }
 
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 16f313531..a4ce3c0d0 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -244,6 +244,7 @@ void PlayerHandler::processPlayerShortcuts(Net::MessageIn &msg)
         msg.readInt32("item or skill id");
         msg.readInt16("skill level");
     }
+    msg.skip(77, "unused");
 }
 
 void PlayerHandler::processPlayerShowEquip(Net::MessageIn &msg)