@@ -229,11 +229,11 @@
 		    of_range(2, [comp length] - 2)];
 
 		if ([comp hasPrefix: @"r="]) {
 			if (![entry hasPrefix: cNonce])
 				@throw [XMPPAuthFailedException
-				    exceptionWithClass: isa
+				    exceptionWithClass: [self class]
 					    connection: nil
 						reason: @"Received wrong "
 							@"nonce"];
 
 			sNonce = entry;
@@ -247,11 +247,12 @@
 			got |= GOT_ITERCOUNT;
 		}
 	}
 
 	if (got != (GOT_SNONCE | GOT_SALT | GOT_ITERCOUNT))
-		@throw [OFInvalidServerReplyException exceptionWithClass: isa];
+		@throw [OFInvalidServerReplyException
+		    exceptionWithClass: [self class]];
 
 	// Add c=<base64(GS2Header+channelBindingData)>
 	tmpArray = [OFDataArray dataArray];
 	[tmpArray addItemsFromCArray: [GS2Header UTF8String]
 			       count: [GS2Header UTF8StringLength]];
@@ -390,17 +391,17 @@
 	value = [mess substringWithRange: of_range(2, [mess length] - 2)];
 
 	if ([mess hasPrefix: @"v="]) {
 		if (![value isEqual: [serverSignature stringByBase64Encoding]])
 			@throw [XMPPAuthFailedException
-			    exceptionWithClass: isa
+			    exceptionWithClass: [self class]
 				    connection: nil
 					reason: @"Received wrong "
 						@"ServerSignature"];
 		authenticated = YES;
 	} else
-		@throw [XMPPAuthFailedException exceptionWithClass: isa
+		@throw [XMPPAuthFailedException exceptionWithClass: [self class]
 							connection: nil
 							    reason: value];
 
 	return nil;
 }