NPE fix for all unmatched tokens, changing the Analyzer for numeric matches