diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 459e9e5ff3..e663768fb5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -156,8 +156,9 @@ public class CastleAmbassador extends AbstractNpcAI
 	@Override
 	public String onSpawn(Npc npc)
 	{
-		final Castle castle = npc.getFort().getCastleByAmbassador(npc.getId());
-		if (castle.getOwnerId() == 0)
+		final Fort fort = npc.getFort();
+		final Castle castle = fort == null ? null : fort.getCastleByAmbassador(npc.getId());
+		if ((castle == null) || (castle.getOwnerId() == 0))
 		{
 			npc.deleteMe();
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 459e9e5ff3..e663768fb5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
@@ -156,8 +156,9 @@ public class CastleAmbassador extends AbstractNpcAI
 	@Override
 	public String onSpawn(Npc npc)
 	{
-		final Castle castle = npc.getFort().getCastleByAmbassador(npc.getId());
-		if (castle.getOwnerId() == 0)
+		final Fort fort = npc.getFort();
+		final Castle castle = fort == null ? null : fort.getCastleByAmbassador(npc.getId());
+		if ((castle == null) || (castle.getOwnerId() == 0))
 		{
 			npc.deleteMe();
 		}