@@ -40,17 +40,19 @@
 	return [[OFWideCString alloc] initWithWideCString: str];
 }
 
 - (char*)cString
 {
-	@throw [OFNotImplementedException new: self withMethod: "cString"];
+	[OFNotImplementedException newWithObject: self
+				       andMethod: "cString"];
 	return NULL;
 }
 
 - (wchar_t*)wcString
 {
-	@throw [OFNotImplementedException new: self withMethod: "wcString"];
+	[OFNotImplementedException newWithObject: self
+				       andMethod: "wcString"];
 	return NULL;
 }
 
 - (size_t)length
 {
@@ -64,21 +66,24 @@
 	return self;
 }
 
 - (OFString*)clone
 {
-	@throw [OFNotImplementedException new: self withMethod: "clone"];
+	[OFNotImplementedException newWithObject: self
+				       andMethod: "clone"];
 	return nil;
 }
 
 - (int)compare: (OFString*)str
 {
-	@throw [OFNotImplementedException new: self withMethod: "compare:"];
+	[OFNotImplementedException newWithObject: self
+				       andMethod: "compare:"];
 	return 0;
 }
 
 - (OFString*)append: (OFString*)str
 {
-	@throw [OFNotImplementedException new: self withMethod: "append:"];
+	[OFNotImplementedException newWithObject: self
+				       andMethod: "append:"];
 	return nil;
 }
 @end