Modified to include Exception class name in addition to the message