Improve [DOC:8190 Exception class hierarchy]