diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 93bef129b1..5751666826 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -695,9 +695,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 94a1b121fe..a651d45b47 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -733,9 +733,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 94a1b121fe..a651d45b47 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -733,9 +733,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 3be65214a1..92f96ef72e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -733,9 +733,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d6bd9443a8..ed9fa7db03 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -739,9 +739,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 11c3b5aad2..ad4727da29 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -739,9 +739,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 11c3b5aad2..ad4727da29 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -739,9 +739,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index dfb494bb50..709fc4ff4e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -745,9 +745,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 32bc3b21ea..3f96a79b9d 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -762,9 +762,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 42824ae44e..1a10477c48 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -772,9 +772,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 42824ae44e..1a10477c48 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -772,9 +772,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 4f4db4f012..cbba1f84ed 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -694,9 +694,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 4cddf8301c..492085fc62 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -693,9 +693,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 5ea1be09a0..f54149f5f4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -720,9 +720,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index a63ff07528..3c675b12fa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -720,9 +720,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 362bee2837..c98748000c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -730,9 +730,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 362bee2837..c98748000c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -730,9 +730,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 362bee2837..c98748000c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -730,9 +730,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 3a643ca4aa..afe7b85e1c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -734,9 +734,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 2397e49057..eff1180d7f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -716,9 +716,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 978fe9ccd5..96f63646e3 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -768,9 +768,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d9956828cb..29c4d5189e 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -782,9 +782,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d9956828cb..29c4d5189e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -782,9 +782,13 @@ public class EnterWorld implements IClientIncomingPacket
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
 					{
-						if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
+						if (plr.isOnlineInt() == 1)
 						{
-							count++;
+							final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
+							if ((hwi != null) && hwi.equals(hwInfo))
+							{
+								count++;
+							}
 						}
 					}
 					if (count >= Config.MAX_PLAYERS_PER_HWID)