diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
index 20afab48c0..466e65dc9f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java
@@ -90,6 +90,20 @@ public class TriggerSkillBySkill extends AbstractEffect
 			return;
 		}
 		
+		WorldObject target = null;
+		try
+		{
+			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), _skill.getSkill(), false, false, false);
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
+		}
+		if ((target == null) || !target.isCreature())
+		{
+			return;
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{
@@ -97,7 +111,7 @@ public class TriggerSkillBySkill extends AbstractEffect
 		}
 		else
 		{
-			final BuffInfo buffInfo = ((Creature) event.getTarget()).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
+			final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId());
 			if (buffInfo != null)
 			{
 				triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1));
@@ -108,19 +122,6 @@ public class TriggerSkillBySkill extends AbstractEffect
 			}
 		}
 		
-		WorldObject target = null;
-		try
-		{
-			target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getCaster(), event.getTarget(), triggerSkill, false, false, false);
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "Exception in ITargetTypeHandler.getTarget(): " + e.getMessage(), e);
-		}
-		
-		if ((target != null) && target.isCreature())
-		{
-			SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
-		}
+		SkillCaster.triggerCast(event.getCaster(), (Creature) target, triggerSkill);
 	}
 }