@@ -49,22 +49,20 @@
 - (void)dealloc
 {
 	if (_conditionInitialized)
 		if (!of_condition_free(&_condition))
 			@throw [OFConditionStillWaitingException
-			    exceptionWithClass: [self class]
-				     condition: self];
+			    exceptionWithCondition: self];
 
 	[super dealloc];
 }
 
 - (void)wait
 {
 	if (!of_condition_wait(&_condition, &_mutex))
 		@throw [OFConditionWaitFailedException
-		    exceptionWithClass: [self class]
-			     condition: self];
+		    exceptionWithCondition: self];
 }
 
 - (bool)waitForTimeInterval: (double)timeInterval
 {
 	return of_condition_timed_wait(&_condition, &_mutex, timeInterval);
@@ -78,17 +76,15 @@
 
 - (void)signal
 {
 	if (!of_condition_signal(&_condition))
 		@throw [OFConditionSignalFailedException
-		    exceptionWithClass: [self class]
-			     condition: self];
+		    exceptionWithCondition: self];
 }
 
 - (void)broadcast
 {
 	if (!of_condition_broadcast(&_condition))
 		@throw [OFConditionBroadcastFailedException
-		    exceptionWithClass: [self class]
-			     condition: self];
+		    exceptionWithCondition: self];
 }
 @end