@@ -14,34 +14,37 @@
  * file.
  */
 
 #include "config.h"
 
-#import "OFEnumerator.h"
+#include <stdlib.h>
 
-#import "OFNotImplementedException.h"
+#import "OFEnumerator.h"
 
 @implementation OFEnumerator
 - init
 {
 	if (object_getClass(self) == [OFEnumerator class]) {
-		Class c = [self class];
-		[self release];
-		@throw [OFNotImplementedException exceptionWithClass: c
-							    selector: _cmd];
+		@try {
+			[self doesNotRecognizeSelector: _cmd];
+			abort();
+		} @catch (id e) {
+			[self release];
+			@throw e;
+		}
 	}
 
 	return [super init];
 }
 
 - (id)nextObject
 {
-	@throw [OFNotImplementedException exceptionWithClass: [self class]
-						    selector: _cmd];
+	[self doesNotRecognizeSelector: _cmd];
+	abort();
 }
 
 - (void)reset
 {
-	@throw [OFNotImplementedException exceptionWithClass: [self class]
-						    selector: _cmd];
+	[self doesNotRecognizeSelector: _cmd];
+	abort();
 }
 @end