diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index a331ebcf24..d7fa846e4f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index c62963d43c..2b0d9e0692 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index c62963d43c..2b0d9e0692 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index c62963d43c..2b0d9e0692 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index d755db4d2a..024f299c7c 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index d755db4d2a..024f299c7c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index d755db4d2a..024f299c7c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5ff19a662a..582cb70476 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5ff19a662a..582cb70476 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 5ff19a662a..582cb70476 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 74294e3c6a..3c35d333ff 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 74294e3c6a..3c35d333ff 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 74294e3c6a..3c35d333ff 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 74294e3c6a..3c35d333ff 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 74294e3c6a..3c35d333ff 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index dab8fe5599..c777bb7253 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -827,7 +827,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 74294e3c6a..3c35d333ff 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -822,7 +822,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 05a74789bd..5ba092a21a 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -827,7 +827,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 05a74789bd..5ba092a21a 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -827,7 +827,14 @@ public class SkillCaster implements Runnable
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
-					if ((objTarget != null) && objTarget.isCreature())
+					
+					// Avoid triggering skills on invalid targets.
+					if (objTarget == null)
+					{
+						return;
+					}
+					
+					if (objTarget.isCreature())
 					{
 						currentTarget = objTarget;
 					}