Conform to PEP-0008: use Error for custom exceptions.
Merge branch 'error'