@@ -29,11 +29,11 @@
 #endif
 
 @implementation OFException
 + newWithObject: (id)obj
 {
-	return [[OFException alloc] initWithObject: obj];
+	return [[self alloc] initWithObject: obj];
 }
 
 - initWithObject: (id)obj
 {
 	if ((self = [super init])) {
@@ -60,12 +60,12 @@
 
 @implementation OFNoMemException
 + newWithObject: (id)obj
 	andSize: (size_t)size
 {
-	return [[OFNoMemException alloc] initWithObject: obj
-						andSize: size];
+	return [[self alloc] initWithObject: obj
+				    andSize: size];
 }
 
 - initWithObject: (id)obj
 	 andSize: (size_t)size
 {
@@ -94,12 +94,12 @@
 
 @implementation OFMemNotPartOfObjException
 + newWithObject: (id)obj
      andPointer: (void*)ptr
 {
-	return [[OFMemNotPartOfObjException alloc] initWithObject: obj
-						       andPointer: ptr];
+	return [[self alloc] initWithObject: obj
+				 andPointer: ptr];
 }
 
 - initWithObject: (id)obj
       andPointer: (void*)ptr
 {
@@ -131,11 +131,11 @@
 @end
 
 @implementation OFOutOfRangeException
 + newWithObject: (id)obj
 {
-	return [[OFOutOfRangeException alloc] initWithObject: obj];
+	return [[self alloc] initWithObject: obj];
 }
 
 - initWithObject: (id)obj
 {
 	return (self = [super initWithObject: obj]);
@@ -156,13 +156,13 @@
 @implementation OFOpenFileFailedException
 + newWithObject: (id)obj
 	andPath: (const char*)p
 	andMode: (const char*)m
 {
-	return [[OFOpenFileFailedException alloc] initWithObject: obj
-							 andPath: p
-							 andMode: m];
+	return [[self alloc] initWithObject: obj
+				    andPath: p
+				    andMode: m];
 }
 
 - initWithObject: (id)obj
 	 andPath: (const char*)p
 	 andMode: (const char*)m
@@ -210,13 +210,13 @@
 @implementation OFReadOrWriteFailedException
 + newWithObject: (id)obj
 	andSize: (size_t)size
       andNItems: (size_t)nitems
 {
-	return [[OFReadOrWriteFailedException alloc] initWithObject: obj
-							    andSize: size
-							  andNItems: nitems];
+	return [[self alloc] initWithObject: obj
+				    andSize: size
+				  andNItems: nitems];
 }
 
 - initWithObject: (id)obj
 	 andSize: (size_t)size
        andNItems: (size_t)nitems