1 files changed, 4 insertions, 6 deletions
diff --git a/src/net/eathena/messagehandler.cpp b/src/net/eathena/messagehandler.cpp
index bdfbe49e6..f8490ed1d 100644
--- a/src/net/eathena/messagehandler.cpp
+++ b/src/net/eathena/messagehandler.cpp
@@ -32,21 +32,19 @@ namespace EAthena
 {
 
 MessageHandler::MessageHandler() :
-    Net::MessageHandler(),
-    mNetwork(nullptr)
+    Net::MessageHandler()
 {
 }
 
 MessageHandler::~MessageHandler()
 {
-    if (mNetwork)
-        mNetwork->unregisterHandler(this);
+    if (Network::mInstance)
+        Network::mInstance->unregisterHandler(this);
 }
 
 void MessageHandler::setNetwork(Network *const network)
 {
-    assert(!(network && mNetwork));
-    mNetwork = network;
+    assert(!(network && Network::mInstance));
 }
 
 }  // namespace EAthena