@@ -20,38 +20,47 @@
  * @brief An exception indicating the given memory is not part of the object.
  */
 @interface OFMemoryNotPartOfObjectException: OFException
 {
 	void *_pointer;
+	id _object;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly) void *pointer;
+@property (readonly, retain, nonatomic) id object;
 #endif
 
 /*!
  * @brief Creates a new, autoreleased memory not part of object exception.
  *
- * @param class_ The class of the object which caused the exception
  * @param pointer A pointer to the memory that is not part of the object
+ * @param object The object which the memory is not part of
  * @return A new, autoreleased memory not part of object exception
  */
-+ (instancetype)exceptionWithClass: (Class)class_
-			   pointer: (void*)pointer;
++ (instancetype)exceptionWithPointer: (void*)pointer
+			      object: (id)object;
 
 /*!
  * @brief Initializes an already allocated memory not part of object exception.
  *
- * @param class_ The class of the object which caused the exception
  * @param pointer A pointer to the memory that is not part of the object
+ * @param object The object which the memory is not part of
  * @return An initialized memory not part of object exception
  */
-- initWithClass: (Class)class_
-	pointer: (void*)pointer;
+- initWithPointer: (void*)pointer
+	   object: (id)object;
 
 /*!
  * @brief Returns a pointer to the memory which is not part of the object.
  *
  * @return A pointer to the memory which is not part of the object
  */
 - (void*)pointer;
+
+/*!
+ * @brief Returns the object which the memory is not part of.
+ *
+ * @return The object which the memory is not part of
+ */
+- (id)object;
 @end