diff --git a/src/main/java/org/ahocorasick/trie/Trie.java b/src/main/java/org/ahocorasick/trie/Trie.java index 315d749..340b725 100644 --- a/src/main/java/org/ahocorasick/trie/Trie.java +++ b/src/main/java/org/ahocorasick/trie/Trie.java @@ -75,8 +75,8 @@ public class Trie { * @return null if no matches found. */ public Emit firstMatch(final CharSequence text) { - PayloadEmit firstMatch = this.payloadTrie.firstMatch(text); - return new Emit(firstMatch.getStart(), firstMatch.getEnd(), firstMatch.getKeyword()); + final PayloadEmit payload = this.payloadTrie.firstMatch(text); + return payload == null ? null : new Emit(payload.getStart(), payload.getEnd(), payload.getKeyword()); } /**