diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
index ef1d0ec3b3..9106660946 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java
@@ -85,6 +85,10 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect
 	{
 		final Creature creature = event.getCreature();
 		final AtomicBoolean update = _updates.get(creature);
+		if (update == null)
+		{
+			return;
+		}
 		if (canPump(null, creature, null))
 		{
 			if (update.get())