Improved ParseError detection.