@@ -166,13 +166,12 @@
 
 	_cNonce = [[self XMPP_genNonce] retain];
 
 	[_clientFirstMessageBare release];
 	_clientFirstMessageBare = nil;
-	_clientFirstMessageBare = [[OFString alloc] initWithFormat: @"n=%@,r=%@",
-								   _authcid,
-								   _cNonce];
+	_clientFirstMessageBare = [[OFString alloc]
+	    initWithFormat: @"n=%@,r=%@", _authcid, _cNonce];
 
 	[ret addItems: [_GS2Header UTF8String]
 		count: [_GS2Header UTF8StringLength]];
 
 	[ret addItems: [_clientFirstMessageBare UTF8String]
@@ -228,14 +227,13 @@
 		    of_range(2, [comp length] - 2)];
 
 		if ([comp hasPrefix: @"r="]) {
 			if (![entry hasPrefix: _cNonce])
 				@throw [XMPPAuthFailedException
-				    exceptionWithClass: [self class]
-					    connection: nil
-						reason: @"Received wrong "
-							@"nonce"];
+				    exceptionWithConnection: nil
+						     reason: @"Received wrong "
+							     @"nonce"];
 
 			sNonce = entry;
 			got |= GOT_SNONCE;
 		} else if ([comp hasPrefix: @"s="]) {
 			salt = [OFDataArray
@@ -246,12 +244,11 @@
 			got |= GOT_ITERCOUNT;
 		}
 	}
 
 	if (got != (GOT_SNONCE | GOT_SALT | GOT_ITERCOUNT))
-		@throw [OFInvalidServerReplyException
-		    exceptionWithClass: [self class]];
+		@throw [OFInvalidServerReplyException exception];
 
 	// Add c=<base64(GS2Header+channelBindingData)>
 	tmpArray = [OFDataArray dataArray];
 	[tmpArray addItems: [_GS2Header UTF8String]
 		     count: [_GS2Header UTF8StringLength]];
@@ -388,19 +385,17 @@
 	value = [mess substringWithRange: of_range(2, [mess length] - 2)];
 
 	if ([mess hasPrefix: @"v="]) {
 		if (![value isEqual: [_serverSignature stringByBase64Encoding]])
 			@throw [XMPPAuthFailedException
-			    exceptionWithClass: [self class]
-				    connection: nil
-					reason: @"Received wrong "
-						@"ServerSignature"];
+			    exceptionWithConnection: nil
+					     reason: @"Received wrong "
+						     @"ServerSignature"];
 		_authenticated = YES;
 	} else
-		@throw [XMPPAuthFailedException exceptionWithClass: [self class]
-							connection: nil
-							    reason: value];
+		@throw [XMPPAuthFailedException exceptionWithConnection: nil
+								 reason: value];
 
 	return nil;
 }
 
 - (OFString*)XMPP_genNonce