Exception class improvement