re-introduce parse error handling