diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch
index 278477b7c1..fa95b726cc 100644
--- a/nms-patches/EntityPlayer.patch
+++ b/nms-patches/EntityPlayer.patch
@@ -371,7 +371,7 @@
 +        ResourceKey<DimensionManager> resourcekey = worldserver1.getTypeKey(); // CraftBukkit
  
 -        if (resourcekey == World.THE_END && worldserver.getDimensionKey() == World.OVERWORLD) {
-+        if (resourcekey == DimensionManager.THE_END && worldserver.getTypeKey() == DimensionManager.OVERWORLD) { // CraftBukkit
++        if (resourcekey == DimensionManager.THE_END && worldserver != null && worldserver.getTypeKey() == DimensionManager.OVERWORLD) { // CraftBukkit
 +            this.worldChangeInvuln = true; // CraftBukkit - Moved down from above
              this.decouple();
              this.getWorldServer().removePlayer(this);