@@ -152,12 +152,11 @@
 		if (object_getClass(self) == [OFString_const class])
 			return;
 
 		if ((ivars = calloc(1, sizeof(*ivars))) == NULL)
 			@throw [OFOutOfMemoryException
-			    exceptionWithClass: [self class]
-				 requestedSize: sizeof(*ivars)];
+			    exceptionWithRequestedSize: sizeof(*ivars)];
 
 		ivars->cString = _cString;
 		ivars->cStringLength = _cStringLength;
 
 		switch (of_string_utf8_check(ivars->cString,
@@ -166,12 +165,11 @@
 			case 1:
 				ivars->isUTF8 = true;
 				break;
 			case -1:
 				free(ivars);
-				@throw [OFInvalidEncodingException
-				    exceptionWithClass: [self class]];
+				@throw [OFInvalidEncodingException exception];
 		}
 
 		_cString = (char*)ivars;
 		object_setClass(self, [OFString_const class]);
 	}