1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java b/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
index fa9ed13..c5fc473 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
@@ -115,16 +115,19 @@ public class HashEntryTree<T> implements EntryTree<T> {
 
                 Entry<?> rootEntry = ancestry.get(0);
                 HashTreeNode<T> node = make ? root.computeIfAbsent(rootEntry, HashTreeNode::new) : root.get(rootEntry);
+                if (node == null) {
+                        return Collections.emptyList();
+                }
+
                 path.add(node);
 
                 for (int i = 1; i < ancestry.size(); i++) {
+                        Entry<?> ancestor = ancestry.get(i);
+                        node = make ? node.computeChild(ancestor) : node.getChild(ancestor);
                         if (node == null) {
                                 return Collections.emptyList();
                         }
 
-                        Entry<?> ancestor = ancestry.get(i);
-                        node = make ? node.computeChild(ancestor) : node.getChild(ancestor);
-
                         path.add(node);
                 }