diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java
index 7d02c7ff75..4b48270ba9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Stun.java
@@ -53,6 +53,10 @@ public class Stun extends AbstractEffect
 	public void onExit(BuffInfo info)
 	{
 		final Creature effected = info.getEffected();
+		if ((effected == null) || effected.isRaid())
+		{
+			return;
+		}
 		effected.stopStunning(false);
 		if (effected.isSummon())
 		{
@@ -83,6 +87,6 @@ public class Stun extends AbstractEffect
 		{
 			return;
 		}
-		info.getEffected().startStunning();
+		effected.startStunning();
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java
index 7d02c7ff75..4b48270ba9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java
@@ -53,6 +53,10 @@ public class Stun extends AbstractEffect
 	public void onExit(BuffInfo info)
 	{
 		final Creature effected = info.getEffected();
+		if ((effected == null) || effected.isRaid())
+		{
+			return;
+		}
 		effected.stopStunning(false);
 		if (effected.isSummon())
 		{
@@ -83,6 +87,6 @@ public class Stun extends AbstractEffect
 		{
 			return;
 		}
-		info.getEffected().startStunning();
+		effected.startStunning();
 	}
 }