fix bug allowing null at end of tokenized helper string list
Merge branch 'master' into benchmarks