@@ -370,12 +370,12 @@
 	if (pos == OF_NOT_FOUND)
 		return [self sendErrorAndClose: 400];
 
 	method = [line substringWithRange: of_range(0, pos)];
 	@try {
-		_method = of_http_request_method_from_string(method.UTF8String);
-	} @catch (OFInvalidFormatException *e) {
+		_method = of_http_request_method_from_string(method);
+	} @catch (OFInvalidArgumentException *e) {
 		return [self sendErrorAndClose: 405];
 	}
 
 	@try {
 		of_range_t range = of_range(pos + 1, line.length - pos - 10);