[master] Simple handling for parsing errors