Be more flexible in error parsing.
Merge pull request #2 from cgc/master

Be more flexible in error parsing.