remove unnecessary parse() code that throws a NPE
Merge branch 'fix_parse_npe'