@@ -99,14 +99,13 @@
 
 - (void)setProtocolVersion: (of_http_request_protocol_version_t)protocolVersion
 {
 	if (protocolVersion.major != 1 || protocolVersion.minor > 1)
 		@throw [OFUnsupportedVersionException
-		    exceptionWithClass: [self class]
-			       version: [OFString stringWithFormat: @"%u.%u",
-					    protocolVersion.major,
-					    protocolVersion.minor]];
+		    exceptionWithVersion: [OFString stringWithFormat: @"%u.%u",
+					      protocolVersion.major,
+					      protocolVersion.minor]];
 
 	_protocolVersion = protocolVersion;
 }
 
 - (of_http_request_protocol_version_t)protocolVersion
@@ -120,18 +119,17 @@
 	OFArray *components = [string componentsSeparatedByString: @"."];
 	intmax_t major, minor;
 	of_http_request_protocol_version_t protocolVersion;
 
 	if ([components count] != 2)
-		@throw [OFInvalidFormatException
-		    exceptionWithClass: [self class]];
+		@throw [OFInvalidFormatException exception];
 
 	major = [[components firstObject] decimalValue];
 	minor = [[components lastObject] decimalValue];
 
 	if (major < 0 || major > UINT8_MAX || minor < 0 || minor > UINT8_MAX)
-		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
+		@throw [OFOutOfRangeException exception];
 
 	protocolVersion.major = (uint8_t)major;
 	protocolVersion.minor = (uint8_t)minor;
 
 	[self setProtocolVersion: protocolVersion];