Restore exception name to output message
Improve three docstrings