@@ -145,12 +145,17 @@
 
 		firstLetter = false;
 		tmp++;
 	}
 
-	return [OFString stringWithUTF8StringNoCopy: cString
-				       freeWhenDone: true];
+	@try {
+		return [OFString stringWithUTF8StringNoCopy: cString
+					       freeWhenDone: true];
+	} @catch (id e) {
+		free(cString);
+		@throw e;
+	}
 }
 
 @implementation OFHTTPServerResponse
 - (instancetype)initWithSocket: (OFStreamSocket *)sock
 			server: (OFHTTPServer *)server