Bug fix, was being too cute!
More specific error handling. This parser is coming into its own.