Improved parser's failure handling