exception class fixes