Add support for errors with more than one name.

2 files changed