Index: src/exceptions/OFConditionStillWaitingException.h
==================================================================
--- src/exceptions/OFConditionStillWaitingException.h
+++ src/exceptions/OFConditionStillWaitingException.h
@@ -37,26 +37,26 @@
 }
 
 /**
  * @brief The condition for which is still being waited.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFCondition *condition;
+@property (readonly, nonatomic) OFCondition *condition;
 
 /**
  * @brief Creates a new, autoreleased condition still waiting exception.
  *
  * @param condition The condition for which is still being waited
  * @return A new, autoreleased condition still waiting exception
  */
-+ (instancetype)exceptionWithCondition: (nullable OFCondition *)condition;
++ (instancetype)exceptionWithCondition: (OFCondition *)condition;
 
 /**
  * @brief Initializes an already allocated condition still waiting exception.
  *
  * @param condition The condition for which is still being waited
  * @return An initialized condition still waiting exception
  */
-- (instancetype)initWithCondition: (nullable OFCondition *)condition
+- (instancetype)initWithCondition: (OFCondition *)condition
     OF_DESIGNATED_INITIALIZER;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/exceptions/OFConditionStillWaitingException.m
==================================================================
--- src/exceptions/OFConditionStillWaitingException.m
+++ src/exceptions/OFConditionStillWaitingException.m
@@ -48,15 +48,11 @@
 	[super dealloc];
 }
 
 - (OFString *)description
 {
-	if (_condition != nil)
-		return [OFString stringWithFormat:
-		    @"Deallocation of a condition of type %@ was tried, even "
-		    "though a thread was still waiting for it!",
-		    _condition.class];
-	else
-		return @"Deallocation of a condition was tried, even though a "
-		    "thread was still waiting for it!";
+	return [OFString stringWithFormat:
+	    @"Deallocation of a condition of type %@ was tried, even though "
+	    "a thread was still waiting for it!",
+	    _condition.class];
 }
 @end