@@ -111,26 +111,26 @@
 {
 	uint32_t hash = [key hash] & (size - 1);
 	of_list_object_t *iter;
 
 	if (data[hash] == nil)
-		return nil;
+		@throw [OFNotInSetException newWithClass: isa];
 
 	for (iter = [data[hash] first]; iter != NULL; iter = iter->next->next)
 		if ([iter->object isEqual: key])
 			return iter->next->object;
 
-	return nil;
+	@throw [OFNotInSetException newWithClass: isa];
 }
 
 - remove: (OFObject*)key
 {
 	uint32_t hash = [key hash] & (size - 1);
 	of_list_object_t *iter;
 
 	if (data[hash] == nil)
-		return self; // FIXME: Throw exception?
+		@throw [OFNotInSetException newWithClass: isa];
 
 	for (iter = [data[hash] first]; iter != NULL; iter = iter->next->next) {
 		if ([iter->object isEqual: key]) {
 			[data[hash] remove: iter->next];
 			[data[hash] remove: iter];
@@ -137,15 +137,15 @@
 
 			return self;
 		}
 	}
 
-	return self;  // FIXME: Throw exception?
+	@throw [OFNotInSetException newWithClass: isa];
 }
 
 /* FIXME: Implement this! */
 /*
 - (BOOL)isEqual
 {
 }
 */
 @end