diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e11edcd961..f92ae2f9d7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1018,6 +1018,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e11edcd961..f92ae2f9d7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1018,6 +1018,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}
 	
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
index e55f1b4a2f..95839a8065 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java
@@ -1025,6 +1025,10 @@ public class Fort extends AbstractResidence
 	 */
 	public int getCastleIdByAmbassador(int npcId)
 	{
+		if ((_envoyCastles == null) || !_envoyCastles.containsKey(npcId))
+		{
+			return -1;
+		}
 		return _envoyCastles.get(npcId);
 	}