diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java
index 0d627936a3..d07760eefd 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java
@@ -140,6 +140,12 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket
 				}
 				
 				final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId);
+				if (template == null)
+				{
+					LOGGER.warning("Counld not find Homunculus template " + homunculusId + ".");
+					return;
+				}
+				
 				final Homunculus homunculus = new Homunculus(template, player.getHomunculusList().size(), 1, 0, 0, 0, 0, 0, 0, false);
 				if (player.getHomunculusList().add(homunculus))
 				{
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java
index 0d627936a3..d07760eefd 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java
@@ -140,6 +140,12 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket
 				}
 				
 				final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId);
+				if (template == null)
+				{
+					LOGGER.warning("Counld not find Homunculus template " + homunculusId + ".");
+					return;
+				}
+				
 				final Homunculus homunculus = new Homunculus(template, player.getHomunculusList().size(), 1, 0, 0, 0, 0, 0, 0, false);
 				if (player.getHomunculusList().add(homunculus))
 				{