diff --git a/Spigot-Server-Patches/Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/Add-getEntity-by-UUID-API.patch
index f7ddf0e23..59a588c44 100644
--- a/Spigot-Server-Patches/Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/Add-getEntity-by-UUID-API.patch
@@ -17,6 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public Entity getEntity(UUID uuid) {
 +        Entity entity;
 +        for (WorldServer world : worldServer) {
++            if (world == null) {
++                continue;
++            }
 +            entity = world.getEntity(uuid);
 +            if (entity != null && !entity.dead) {
 +                return entity;