Moving more data into exception classes