diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
index fcdbefc508..0db41ca1a1 100644
--- a/src/main/java/net/minecraft/server/EntityHanging.java
+++ b/src/main/java/net/minecraft/server/EntityHanging.java
@@ -226,7 +226,7 @@ public abstract class EntityHanging extends Entity {
                 this.world.getServer().getPluginManager().callEvent(paintingEvent);
             }
 
-            if (dead || event.isCancelled() || (paintingEvent != null && paintingEvent.isCancelled())) {
+            if (dead || (event != null && event.isCancelled()) || (paintingEvent != null && paintingEvent.isCancelled())) {
                 return true;
             }
             // CraftBukkit end