Merge "Add missing error check in TrieMap."