fixing exception classes