@@ -2242,18 +2242,25 @@
 
 - (OFArray *)componentsSeparatedByString: (OFString *)delimiter
 				 options: (int)options
 {
 	void *pool;
-	OFMutableArray *array = [OFMutableArray array];
+	OFMutableArray *array;
 	const of_unichar_t *characters, *delimiterCharacters;
 	bool skipEmpty = (options & OF_STRING_SKIP_EMPTY);
 	size_t length = self.length;
 	size_t delimiterLength = delimiter.length;
 	size_t last;
 	OFString *component;
 
+	if (delimiter == nil)
+		@throw [OFInvalidArgumentException exception];
+
+	if (delimiter.length == 0)
+		return [OFArray arrayWithObject: self];
+
+	array = [OFMutableArray array];
 	pool = objc_autoreleasePoolPush();
 
 	characters = self.characters;
 	delimiterCharacters = delimiter.characters;