diff --git a/pom.xml b/pom.xml
index f32c023..8cd66cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.30.4-beta</version>
+    <version>1.30.5-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
diff --git a/src/main/java/cn/lunadeer/dominion/Cache.java b/src/main/java/cn/lunadeer/dominion/Cache.java
index dad0b4e..7f1abe2 100644
--- a/src/main/java/cn/lunadeer/dominion/Cache.java
+++ b/src/main/java/cn/lunadeer/dominion/Cache.java
@@ -218,9 +218,7 @@ public class Cache {
     }
 
     public DominionDTO getDominion(Location loc) {
-        List<DominionNode> tree = world_dominion_tree.get(loc.getWorld().getName());
-        if (tree == null) return null;
-        return getLocInDominionDTO(tree, loc);
+        return getLocInDominionDTO(world_dominion_tree.get(loc.getWorld().getName()), loc);
     }
 
     public List<DominionNode> getDominionTreeByPlayer(String player_name) {
diff --git a/src/main/java/cn/lunadeer/dominion/DominionNode.java b/src/main/java/cn/lunadeer/dominion/DominionNode.java
index 162d903..1ec848f 100644
--- a/src/main/java/cn/lunadeer/dominion/DominionNode.java
+++ b/src/main/java/cn/lunadeer/dominion/DominionNode.java
@@ -44,7 +44,9 @@ public class DominionNode {
         return null;
     }
 
-    public static DominionDTO getLocInDominionDTO(@NotNull List<DominionNode> nodes, @NotNull Location loc) {
+    public static DominionDTO getLocInDominionDTO(@Nullable List<DominionNode> nodes, @NotNull Location loc) {
+        if (nodes == null) return null;
+        if (nodes.isEmpty()) return null;
         DominionNode dominionNode = getLocInDominionNode(nodes, loc);
         return dominionNode == null ? null : dominionNode.dominion;
     }