diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 92046bd317..833470d658 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 92046bd317..833470d658 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 92046bd317..833470d658 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 92046bd317..833470d658 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 91ad4b640c..8560e950c1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1161,7 +1161,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1277,7 +1278,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1291,11 +1294,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index c2ee4f3369..96eb8783b6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1161,7 +1161,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1277,7 +1278,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1291,11 +1294,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 492e04e295..a8ec44fa97 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 492e04e295..a8ec44fa97 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 492e04e295..a8ec44fa97 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 492e04e295..a8ec44fa97 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 492e04e295..a8ec44fa97 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index e64b7b7ca2..fd679e0608 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 492e04e295..a8ec44fa97 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
 		
 		if (pledgeType != Clan.SUBUNIT_ACADEMY)
 		{
-			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+			final ClanMember member = clan.getClanMember(leaderName);
+			if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 			{
 				if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
 				{
@@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
 			player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
 			return;
 		}
-		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
+		
+		final ClanMember member = clan.getClanMember(leaderName);
+		if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
 		{
 			if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
 			{
@@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
 			return;
 		}
 		
-		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		subPledge.setLeaderId(member.getObjectId());
 		clan.updateSubPledgeInDB(subPledge.getId());
 		
-		final ClanMember leaderSubPledge = clan.getClanMember(leaderName);
-		final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		final PlayerInstance leaderPlayer = member.getPlayerInstance();
 		if (leaderPlayer != null)
 		{
 			leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));