@@ -229,13 +229,14 @@
 		    of_range(2, [comp length] - 2)];
 
 		if ([comp hasPrefix: @"r="]) {
 			if (![entry hasPrefix: cNonce])
 				@throw [XMPPAuthFailedException
-				    newWithClass: isa
-				      connection: nil
-					  reason: @"Received wrong nonce"];
+				    exceptionWithClass: isa
+					    connection: nil
+						reason: @"Received wrong "
+							@"nonce"];
 
 			sNonce = entry;
 			got |= GOT_SNONCE;
 		} else if ([comp hasPrefix: @"s="]) {
 			salt = [OFDataArray
@@ -246,11 +247,11 @@
 			got |= GOT_ITERCOUNT;
 		}
 	}
 
 	if (got != (GOT_SNONCE | GOT_SALT | GOT_ITERCOUNT))
-		@throw [OFInvalidServerReplyException newWithClass: isa];
+		@throw [OFInvalidServerReplyException exceptionWithClass: isa];
 
 	// Add c=<base64(GS2Header+channelBindingData)>
 	tmpArray = [OFDataArray dataArrayWithItemSize: 1];
 	[tmpArray addNItems: [GS2Header UTF8StringLength]
 		 fromCArray: [GS2Header UTF8String]];
@@ -387,18 +388,19 @@
 	value = [mess substringWithRange: of_range(2, [mess length] - 2)];
 
 	if ([mess hasPrefix: @"v="]) {
 		if (![value isEqual: [serverSignature stringByBase64Encoding]])
 			@throw [XMPPAuthFailedException
-			    newWithClass: isa
-			      connection: nil
-				  reason: @"Received wrong ServerSignature"];
+			    exceptionWithClass: isa
+				    connection: nil
+					reason: @"Received wrong "
+						@"ServerSignature"];
 		authenticated = YES;
 	} else
-		@throw [XMPPAuthFailedException newWithClass: isa
-						  connection: nil
-						      reason: value];
+		@throw [XMPPAuthFailedException exceptionWithClass: isa
+							connection: nil
+							    reason: value];
 
 	return nil;
 }
 
 - (OFString*)XMPP_genNonce