add null check in dfa parser