Fixed exception handling with YAML and XML parsers.
Merge pull request #1211 from robhudson/fix-six

Fixed exception handling with YAML and XML parsers.