Making parsing more robust