@@ -10,13 +10,22 @@
  */
 
 #import <stddef.h>
 #import "OFObject.h"
 
+// FIXME: Exceptions should include which type of error occoured (fopen etc.)
+
 @interface OFException: OFObject
+{
+	char *errstr;
+}
+
 + newWithObject: (id)obj;
 - initWithObject: (id)obj;
+- free;
+- (void)raise;
+- (char*)string;
 @end
 
 @interface OFNoMemException: OFException
 + newWithObject: (id)obj
 	andSize: (size_t)size;
@@ -24,13 +33,13 @@
 	 andSize: (size_t)size;
 @end
 
 @interface OFNotImplementedException: OFException
 + newWithObject: (id)obj
-      andMethod: (const char*)method;
+    andSelector: (SEL)sel;
 - initWithObject: (id)obj
-       andMethod: (const char*)method;
+     andSelector: (SEL)sel;
 @end
 
 @interface OFMemNotPartOfObjException: OFException
 + newWithObject: (id)obj
      andPointer: (void*)ptr;