diff --git a/patches/server/Add-back-EntityPortalExitEvent.patch b/patches/server/Add-back-EntityPortalExitEvent.patch
index c30f71f153..74271818d7 100644
--- a/patches/server/Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/Add-back-EntityPortalExitEvent.patch
@@ -21,7 +21,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                org.bukkit.event.entity.EntityPortalExitEvent event = new org.bukkit.event.entity.EntityPortalExitEvent(bukkitEntity,
 +                    bukkitEntity.getLocation(), new Location(worldserver.getWorld(), position.x, position.y, position.z, yaw, pitch),
 +                    bukkitEntity.getVelocity(), org.bukkit.craftbukkit.util.CraftVector.toBukkit(shapedetectorshape.speed));
-+                if (event.callEvent() && event.getTo() != null && this.isAlive()) {
++                event.callEvent();
++                if (this.isRemoved()) {
++                    return null;
++                }
++
++                if (!event.isCancelled() && event.getTo() != null) {
 +                    worldserver = ((CraftWorld) event.getTo().getWorld()).getHandle();
 +                    position = new Vec3(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ());
 +                    yaw = event.getTo().getYaw();