Index: src/IRCConnection.m
==================================================================
--- src/IRCConnection.m
+++ src/IRCConnection.m
@@ -171,11 +171,10 @@
 	OFString *action = nil;
 
 	@try {
 		line = [sock tryReadLine];
 	} @catch (OFInvalidEncodingException *e) {
-		[e dealloc];
 		line = [sock tryReadLineWithEncoding:
 		    OF_STRING_ENCODING_WINDOWS_1252];
 	}
 
 	if (line == nil)

Index: src/IRCUser.m
==================================================================
--- src/IRCUser.m
+++ src/IRCUser.m
@@ -46,21 +46,23 @@
 	@try {
 		char *tmp;
 
 		if ((tmp2 = strdup([string UTF8String])) == NULL)
 			@throw [OFOutOfMemoryException
-			     newWithClass: isa
-			    requestedSize: [string UTF8StringLength]];
+			     exceptionWithClass: isa
+				  requestedSize: [string UTF8StringLength]];
 
 		if ((tmp = strchr(tmp2, '@')) == NULL)
-			@throw [OFInvalidFormatException newWithClass: isa];
+			@throw [OFInvalidFormatException
+			    exceptionWithClass: isa];
 
 		*tmp = '\0';
 		hostname = [[OFString alloc] initWithUTF8String: tmp + 1];
 
 		if ((tmp = strchr(tmp2, '!')) == NULL)
-			@throw [OFInvalidFormatException newWithClass: isa];
+			@throw [OFInvalidFormatException
+			    exceptionWithClass: isa];
 
 		*tmp = '\0';
 		username = [[OFString alloc] initWithUTF8String: tmp + 1];
 
 		nickname = [[OFString alloc] initWithUTF8String: tmp2];