Improved robustness of parser