@@ -42,10 +42,11 @@
 		STATE_PARAM_VALUE,
 		STATE_PARAM_QUOTED_VALUE,
 		STATE_AFTER_PARAM_VALUE
 	} state = STATE_TYPE;
 	OFString *name = nil, *value = nil, *charset = nil;
+	of_string_encoding_t ret;
 
 	last = 0;
 	for (size_t i = 0; i < length; i++) {
 		switch (state) {
 		case STATE_TYPE:
@@ -125,14 +126,16 @@
 		if ([name isEqual: @"charset"])
 			charset = value;
 	}
 
 	@try {
-		return of_string_parse_encoding(charset);
+		ret = of_string_parse_encoding(charset);
 	} @catch (OFInvalidEncodingException *e) {
-		return OF_STRING_ENCODING_AUTODETECT;
+		ret = OF_STRING_ENCODING_AUTODETECT;
 	}
+
+	return ret;
 }
 
 @implementation OFHTTPResponse
 @synthesize statusCode = _statusCode, headers = _headers, cookies = _cookies;