6 files changed, 9 insertions, 3 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index 6ca853fb..021ae08d 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -38,6 +38,7 @@
 #include "net/ea/chathandler.h"
 #include "net/ea/charserverhandler.h"
 #include "net/ea/gamehandler.h"
+#include "net/ea/guildhandler.h"
 #include "net/ea/inventoryhandler.h"
 #include "net/ea/itemhandler.h"
 #include "net/ea/loginhandler.h"
@@ -79,6 +80,7 @@ GeneralHandler::GeneralHandler():
     mCharHandler(new CharServerHandler),
     mChatHandler(new ChatHandler),
     mGameHandler(new GameHandler),
+    mGuildHandler(new GuildHandler),
     mInventoryHandler(new InventoryHandler),
     mItemHandler(new ItemHandler),
     mLoginHandler(new LoginHandler),
@@ -162,6 +164,7 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mChatHandler.get());
     mNetwork->registerHandler(mCharHandler.get());
     mNetwork->registerHandler(mGameHandler.get());
+    mNetwork->registerHandler(mGuildHandler.get());
     mNetwork->registerHandler(mInventoryHandler.get());
     mNetwork->registerHandler(mItemHandler.get());
     mNetwork->registerHandler(mLoginHandler.get());
diff --git a/src/net/ea/generalhandler.h b/src/net/ea/generalhandler.h
index 579b27b5..464f8bc8 100644
--- a/src/net/ea/generalhandler.h
+++ b/src/net/ea/generalhandler.h
@@ -60,6 +60,7 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler
         MessageHandlerPtr mCharHandler;
         MessageHandlerPtr mChatHandler;
         MessageHandlerPtr mGameHandler;
+        MessageHandlerPtr mGuildHandler;
         MessageHandlerPtr mInventoryHandler;
         MessageHandlerPtr mItemHandler;
         MessageHandlerPtr mLoginHandler;
diff --git a/src/net/ea/messageout.cpp b/src/net/ea/messageout.cpp
index 9e7f2b15..844580a9 100644
--- a/src/net/ea/messageout.cpp
+++ b/src/net/ea/messageout.cpp
@@ -125,4 +125,4 @@ void MessageOut::writeCoordinates(unsigned short x, unsigned short y,
     data[2] |= direction;
 }
 
-}
+} // namespace EAthena
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 3b8ad509..0467241f 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -475,4 +475,4 @@ Uint16 Network::readWord(int pos)
 #endif
 }
 
-}
+} // namespace EAthena
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index baaefb4a..0b391bf0 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -125,6 +125,6 @@ class Network
         static Network *mInstance;
 };
 
-}
+} // namespace EAthena
 
 #endif // NET_EA_NETWORK_H
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 06a39045..dfd56cf1 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -72,10 +72,12 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
         if (msg.getId() == SMSG_NPC_CLOSE)
         {
             closeDialog(npcId);
+            return;
         }
         else if (msg.getId() == SMSG_NPC_NEXT)
         {
             nextDialog(npcId);
+            return;
         }
         else
         {