Merge changes to catch parser errors (old).