@@ -15,10 +15,12 @@
  */
 
 #import "OFException.h"
 #import "OFLocking.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @class OFStillLockedException \
  *	  OFStillLockedException.h ObjFW/OFStillLockedException.h
  *
  * @brief An exception indicating that a lock is still locked.
@@ -29,23 +31,25 @@
 }
 
 /*!
  * The lock which is still locked.
  */
-@property (readonly, nonatomic) id <OFLocking> lock;
+@property OF_NULLABLE_PROPERTY (readonly, nonatomic) id <OFLocking> lock;
 
 /*!
  * @brief Creates a new, autoreleased still locked exception.
  *
  * @param lock The lock which is still locked
  * @return A new, autoreleased still locked exception
  */
-+ (instancetype)exceptionWithLock: (id <OFLocking>)lock;
++ (instancetype)exceptionWithLock: (nullable id <OFLocking>)lock;
 
 /*!
  * @brief Initializes an already allocated still locked exception.
  *
  * @param lock The lock which is still locked
  * @return An initialized still locked exception
  */
-- initWithLock: (id <OFLocking>)lock;
+- initWithLock: (nullable id <OFLocking>)lock;
 @end
+
+OF_ASSUME_NONNULL_END