@@ -50,12 +50,11 @@
 }
 
 - (void*)item: (size_t)item
 {
 	if (item >= items)
-		/* FIXME: Maybe OFOutOfRangeException would be better? */
-		[[OFOverflowException newWithObject: self] raise];
+		[[OFOutOfRangeException newWithObject: self] raise];
 
 	return data + item * itemsize;
 }
 
 - (void*)last
@@ -76,11 +75,11 @@
 
 - addNItems: (size_t)nitems
  fromCArray: (void*)carray
 {
 	if (nitems > SIZE_MAX - items)
-		[[OFOverflowException newWithObject: self] raise];
+		[[OFOutOfRangeException newWithObject: self] raise];
 
 	data = [self resizeMem: data
 		      toNItems: items + nitems
 			ofSize: itemsize];
 
@@ -91,11 +90,11 @@
 }
 
 - removeNItems: (size_t)nitems
 {
 	if (nitems > items)
-		[[OFOverflowException newWithObject: self] raise];
+		[[OFOutOfRangeException newWithObject: self] raise];
 
 	data = [self resizeMem: data
 		      toNItems: items - nitems
 			ofSize: itemsize];