@@ -43,11 +43,11 @@
 
 	puts("Trying to add too much to an array...");
 	a = [OFArray newWithItemSize: 4096];
 	CATCH_EXCEPTION([a addNItems: SIZE_MAX
 			  fromCArray: NULL],
-	    OFOverflowException)
+	    OFOutOfRangeException)
 
 	puts("Trying to add something after that error...");
 	p = [a getMemWithSize: 4096];
 	memset(p, 255, 4096);
 	[a add: p];
@@ -92,14 +92,14 @@
 		puts("[a items] + 2 != i!");
 		abort();
 	}
 
 	puts("Trying to remove more data than we added...");
-	CATCH_EXCEPTION([a removeNItems: [a items] + 1], OFOverflowException);
+	CATCH_EXCEPTION([a removeNItems: [a items] + 1], OFOutOfRangeException);
 
 	puts("Trying to access an index that does not exist...");
-	CATCH_EXCEPTION([a item: [a items]], OFOverflowException);
+	CATCH_EXCEPTION([a item: [a items]], OFOutOfRangeException);
 
 	[a free];
 
 	puts("Creating new array and using it to build a string...");
 	a = [OFArray newWithItemSize: 1];