@@ -108,11 +108,11 @@
 	Stringprep_rc rc;
 
 	if ((rc = stringprep_profile([username_ UTF8String], &node,
 	    "SASLprep", 0)) != STRINGPREP_OK)
 		@throw [XMPPStringPrepFailedException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			    connection: self
 			       profile: @"SASLprep"
 				string: username_];
 
 	@try {
@@ -136,11 +136,11 @@
 	Stringprep_rc rc;
 
 	if ((rc = stringprep_profile([resource_ UTF8String], &res,
 	    "Resourceprep", 0)) != STRINGPREP_OK)
 		@throw [XMPPStringPrepFailedException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			    connection: self
 			       profile: @"Resourceprep"
 				string: resource_];
 
 	@try {
@@ -177,11 +177,11 @@
 	Stringprep_rc rc;
 
 	if ((rc = stringprep_profile([domain_ UTF8String], &srv,
 	    "Nameprep", 0)) != STRINGPREP_OK)
 		@throw [XMPPStringPrepFailedException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			    connection: self
 			       profile: @"Nameprep"
 				string: domain_];
 
 	@try {
@@ -207,11 +207,11 @@
 	Stringprep_rc rc;
 
 	if ((rc = stringprep_profile([password_ UTF8String], &pass,
 	    "SASLprep", 0)) != STRINGPREP_OK)
 		@throw [XMPPStringPrepFailedException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			    connection: self
 			       profile: @"SASLprep"
 				string: password_];
 
 	@try {
@@ -693,14 +693,15 @@
 
 		reason = [[element
 		    elementForName: @"text"
 			 namespace: XMPP_NS_XMPP_STREAM] stringValue];
 
-		@throw [XMPPStreamErrorException exceptionWithClass: isa
-							 connection: self
-							  condition: condition
-							     reason: reason];
+		@throw [XMPPStreamErrorException
+		    exceptionWithClass: [self class]
+			    connection: self
+			     condition: condition
+				reason: reason];
 		return;
 	}
 
 	assert(0);
 }
@@ -733,11 +734,11 @@
 		return;
 	}
 
 	if ([[element name] isEqual: @"failure"])
 		/* TODO: Find/create an exception to throw here */
-		@throw [OFException exceptionWithClass: isa];
+		@throw [OFException exceptionWithClass: [self class]];
 
 	assert(0);
 }
 
 - (void)XMPP_handleSASL: (OFXMLElement*)element
@@ -779,11 +780,11 @@
 
 	if ([[element name] isEqual: @"failure"]) {
 		of_log(@"Auth failed!");
 		// FIXME: Do more parsing/handling
 		@throw [XMPPAuthFailedException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			    connection: self
 				reason: [element XMLString]];
 	}
 
 	assert(0);
@@ -846,11 +847,11 @@
 		return;
 	}
 
 	if (encryptionRequired && !encrypted)
 		/* TODO: Find/create an exception to throw here */
-		@throw [OFException exceptionWithClass: isa];
+		@throw [OFException exceptionWithClass: [self class]];
 
 	if ([element elementForName: @"ver"
 			  namespace: XMPP_NS_ROSTERVER] != nil)
 		supportsRosterVersioning = YES;
 
@@ -1036,11 +1037,11 @@
 	Idna_rc rc;
 
 	if ((rc = idna_to_ascii_8z([domain_ UTF8String],
 	    &cDomain, IDNA_USE_STD3_ASCII_RULES)) != IDNA_SUCCESS)
 		@throw [XMPPIDNATranslationFailedException
-		    exceptionWithClass: isa
+		    exceptionWithClass: [self class]
 			    connection: self
 			     operation: @"ToASCII"
 				string: domain_];
 
 	@try {
@@ -1068,11 +1069,12 @@
 }
 
 - (void)setDataStorage: (id <XMPPStorage>)dataStorage_
 {
 	if (streamOpen)
-		@throw [OFInvalidArgumentException exceptionWithClass: isa];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]];
 
 	dataStorage = dataStorage_;
 }
 
 - (id <XMPPStorage>)dataStorage