@@ -508,23 +508,20 @@
 	lineC = line.UTF8String;
 
 	if ((tmp = strchr(lineC, ':')) == NULL)
 		@throw [OFInvalidServerReplyException exception];
 
-	if ((keyC = malloc(tmp - lineC + 1)) == NULL)
-		@throw [OFOutOfMemoryException
-		    exceptionWithRequestedSize: tmp - lineC + 1];
-
+	keyC = of_malloc(1, tmp - lineC + 1);
 	memcpy(keyC, lineC, tmp - lineC);
 	keyC[tmp - lineC] = '\0';
 	normalizeKey(keyC);
 
 	@try {
 		key = [OFString stringWithUTF8StringNoCopy: keyC
 					      freeWhenDone: true];
 	} @catch (id e) {
-		free(keyC);
+		of_free(keyC);
 		@throw e;
 	}
 
 	do {
 		tmp++;