@@ -18,10 +18,12 @@
 
 #ifndef OF_HAVE_THREADS
 # error No threads available!
 #endif
 
+OF_ASSUME_NONNULL_BEGIN
+
 @class OFCondition;
 
 /*!
  * @class OFConditionStillWaitingException \
  *	  OFConditionStillWaitingException.h \
@@ -36,23 +38,25 @@
 }
 
 /*!
  * The condition for which is still being waited.
  */
-@property (readonly, nonatomic) OFCondition *condition;
+@property OF_NULLABLE_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: (OFCondition*)condition;
++ (instancetype)exceptionWithCondition: (nullable 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
  */
-- initWithCondition: (OFCondition*)condition;
+- initWithCondition: (nullable OFCondition*)condition;
 @end
+
+OF_ASSUME_NONNULL_END