@@ -473,12 +473,11 @@
 	_status = (short)status;
 
 	return true;
 }
 
-- (bool)handleServerHeader: (OFString *)line
-		    socket: (OFTCPSocket *)sock
+- (bool)handleServerHeader: (OFString *)line socket: (OFTCPSocket *)sock
 {
 	OFString *key, *value, *old;
 	const char *lineC, *tmp;
 	char *keyC;
 
@@ -507,20 +506,20 @@
 	lineC = line.UTF8String;
 
 	if ((tmp = strchr(lineC, ':')) == NULL)
 		@throw [OFInvalidServerReplyException exception];
 
-	keyC = of_alloc(tmp - lineC + 1, 1);
+	keyC = OFAllocMemory(tmp - lineC + 1, 1);
 	memcpy(keyC, lineC, tmp - lineC);
 	keyC[tmp - lineC] = '\0';
 	normalizeKey(keyC);
 
 	@try {
 		key = [OFString stringWithUTF8StringNoCopy: keyC
 					      freeWhenDone: true];
 	} @catch (id e) {
-		free(keyC);
+		OFFreeMemory(keyC);
 		@throw e;
 	}
 
 	do {
 		tmp++;