Added exception class names