diff --git a/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java b/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java
index c86c298e2..7bf2125ec 100644
--- a/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java
@@ -20,7 +20,7 @@ public class MobHealthDisplayUpdaterTask extends BukkitRunnable {
 
     @Override
     public void run() {
-        if (target.isValid()) {
+        if (target != null && target.isValid()) {
             target.setCustomNameVisible(oldNameVisible);
             target.setCustomName(oldName);
             target.removeMetadata(mcMMO.customNameKey, mcMMO.p);