diff --git a/nms-patches/World.patch b/nms-patches/World.patch
index fe43a75119..4bd60fff41 100644
--- a/nms-patches/World.patch
+++ b/nms-patches/World.patch
@@ -312,7 +312,7 @@
                      }
                  }
              }
-@@ -626,6 +838,7 @@
+@@ -626,14 +838,21 @@
          }
      }
  
@@ -320,9 +320,11 @@
      @Nullable
      @Override
      public TileEntity getTileEntity(BlockPosition blockposition) {
-@@ -634,6 +847,12 @@
-         } else if (!this.isClientSide && Thread.currentThread() != this.c) {
+         if (isInsideWorld(blockposition)) {
              return null;
+         } else if (!this.isClientSide && Thread.currentThread() != this.c) {
+-            return null;
++            throw new IllegalStateException("Asynchronous tile access"); // CraftBukkit - catch
          } else {
 +            // CraftBukkit start
 +            if (capturedTileEntities.containsKey(blockposition)) {