Added ad-hoc parse-error handling.