Merge pull request #610 from pganssle/parser_errors

Only raise ValueError in parser for now