diff --git a/Client/Core/Networking/Client.cs b/Client/Core/Networking/Client.cs
index 307cbfe9..3c930944 100644
--- a/Client/Core/Networking/Client.cs
+++ b/Client/Core/Networking/Client.cs
@@ -34,9 +34,10 @@ namespace xClient.Core.Networking
         /// <param name="ex">The exception containing information about the cause of the client's failure.</param>
         private void OnClientFail(Exception ex)
         {
-            if (ClientFail != null)
+            var handler = ClientFail;
+            if (handler != null)
             {
-                ClientFail(this, ex);
+                handler(this, ex);
             }
         }
 
@@ -62,9 +63,10 @@ namespace xClient.Core.Networking
 
             Connected = connected;
 
-            if (ClientState != null)
+            var handler = ClientState;
+            if (handler != null)
             {
-                ClientState(this, connected);
+                handler(this, connected);
             }
         }
 
@@ -86,9 +88,10 @@ namespace xClient.Core.Networking
         /// <param name="packet">The packet that has been received by the server.</param>
         private void OnClientRead(IPacket packet)
         {
-            if (ClientRead != null)
+            var handler = ClientRead;
+            if (handler != null)
             {
-                ClientRead(this, packet);
+                handler(this, packet);
             }
         }
 
@@ -114,9 +117,10 @@ namespace xClient.Core.Networking
         /// <param name="rawData">The packet in raw bytes.</param>
         private void OnClientWrite(IPacket packet, long length, byte[] rawData)
         {
-            if (ClientWrite != null)
+            var handler = ClientWrite;
+            if (handler != null)
             {
-                ClientWrite(this, packet, length, rawData);
+                handler(this, packet, length, rawData);
             }
         }
 
diff --git a/Server/Core/Networking/Client.cs b/Server/Core/Networking/Client.cs
index dc78d79a..067cd01f 100644
--- a/Server/Core/Networking/Client.cs
+++ b/Server/Core/Networking/Client.cs
@@ -36,9 +36,10 @@ namespace xServer.Core.Networking
 
             Connected = connected;
 
-            if (ClientState != null)
+            var handler = ClientState;
+            if (handler != null)
             {
-                ClientState(this, connected);
+                handler(this, connected);
             }
         }
 
@@ -61,9 +62,10 @@ namespace xServer.Core.Networking
         /// <param name="packet">The packet that received by the client.</param>
         private void OnClientRead(IPacket packet)
         {
-            if (ClientRead != null)
+            var handler = ClientRead;
+            if (handler != null)
             {
-                ClientRead(this, packet);
+                handler(this, packet);
             }
         }
 
@@ -89,9 +91,10 @@ namespace xServer.Core.Networking
         /// <param name="rawData">The packet in raw bytes.</param>
         private void OnClientWrite(IPacket packet, long length, byte[] rawData)
         {
-            if (ClientWrite != null)
+            var handler = ClientWrite;
+            if (handler != null)
             {
-                ClientWrite(this, packet, length, rawData);
+                handler(this, packet, length, rawData);
             }
         }
 
diff --git a/Server/Core/Networking/Server.cs b/Server/Core/Networking/Server.cs
index f362d10d..99119e49 100644
--- a/Server/Core/Networking/Server.cs
+++ b/Server/Core/Networking/Server.cs
@@ -35,9 +35,10 @@ namespace xServer.Core.Networking
 
             Listening = listening;
 
-            if (ServerState != null)
+            var handler = ServerState;
+            if (handler != null)
             {
-                ServerState(this, listening, Port);
+                handler(this, listening, Port);
             }
         }
 
@@ -61,9 +62,10 @@ namespace xServer.Core.Networking
         /// <param name="connected">The new connection state of the client.</param>
         private void OnClientState(Client c, bool connected)
         {
-            if (ClientState != null)
+            var handler = ClientState;
+            if (handler != null)
             {
-                ClientState(this, c, connected);
+                handler(this, c, connected);
             }
         }
 
@@ -88,9 +90,10 @@ namespace xServer.Core.Networking
         /// <param name="packet">The packet that received by the client.</param>
         private void OnClientRead(Client c, IPacket packet)
         {
-            if (ClientRead != null)
+            var handler = ClientRead;
+            if (handler != null)
             {
-                ClientRead(this, c, packet);
+                handler(this, c, packet);
             }
         }
 
@@ -118,9 +121,10 @@ namespace xServer.Core.Networking
         /// <param name="rawData">The packet in raw bytes.</param>
         private void OnClientWrite(Client c, IPacket packet, long length, byte[] rawData)
         {
-            if (ClientWrite != null)
+            var handler = ClientWrite;
+            if (handler != null)
             {
-                ClientWrite(this, c, packet, length, rawData);
+                handler(this, c, packet, length, rawData);
             }
         }
 
diff --git a/Server/Core/Networking/ServerHandler.cs b/Server/Core/Networking/ServerHandler.cs
index fe8e34c7..c846d40a 100644
--- a/Server/Core/Networking/ServerHandler.cs
+++ b/Server/Core/Networking/ServerHandler.cs
@@ -28,9 +28,10 @@ namespace xServer.Core.Networking
         /// <param name="client">The connected client.</param>
         private void OnClientConnected(Client client)
         {
-            if (ClientConnected != null)
+            var handler = ClientConnected;
+            if (handler != null)
             {
-                ClientConnected(client);
+                handler(client);
             }
         }
 
@@ -51,9 +52,10 @@ namespace xServer.Core.Networking
         /// <param name="client">The disconnected client.</param>
         private void OnClientDisconnected(Client client)
         {
-            if (ClientDisconnected != null)
+            var handler = ClientDisconnected;
+            if (handler != null)
             {
-                ClientDisconnected(client);
+                handler(client);
             }
         }