@@ -126,11 +126,11 @@
 # endif
 
 			page = preallocatedPages[numPreallocatedPages];
 
 			if (numPreallocatedPages == 0) {
-				free(preallocatedPages);
+				of_free(preallocatedPages);
 				preallocatedPages = NULL;
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 				OF_ENSURE(of_tlskey_set(preallocatedPagesKey,
 				    preallocatedPages));
 # endif
@@ -138,18 +138,12 @@
 
 			return page;
 		}
 	}
 
-	if ((page = malloc(sizeof(*page))) == NULL)
-		@throw [OFOutOfMemoryException
-		    exceptionWithRequestedSize: sizeof(*page)];
-
-	if ((page->map = calloc(1, mapSize)) == NULL)
-		@throw [OFOutOfMemoryException
-		    exceptionWithRequestedSize: mapSize];
-
+	page = of_malloc(1, sizeof(*page));
+	page->map = of_calloc(1, mapSize);
 	page->page = mapPages(1);
 	of_explicit_memset(page->page, 0, pageSize);
 
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	lastPage = of_tlskey_get(lastPageKey);
@@ -186,11 +180,11 @@
 	for (size_t i = 0; i < mapSize; i++)
 		if (map[i] != 0)
 			return;
 
 	unmapPages(page->page, 1);
-	free(page->map);
+	of_free(page->map);
 
 	if (page->previous != NULL)
 		page->previous->next = page->next;
 	if (page->next != NULL)
 		page->next->previous = page->previous;
@@ -205,11 +199,11 @@
 		OF_ENSURE(of_tlskey_set(firstPageKey, page->next));
 	if (of_tlskey_get(lastPageKey) == page)
 		OF_ENSURE(of_tlskey_set(lastPageKey, page->previous));
 # endif
 
-	free(page);
+	of_free(page);
 }
 
 static void *
 allocateMemory(struct page *page, size_t bytes)
 {
@@ -286,15 +280,11 @@
 # endif
 
 	if (preallocatedPages != NULL)
 		@throw [OFInvalidArgumentException exception];
 
-	preallocatedPages = calloc(numPages, sizeof(struct page));
-	if (preallocatedPages == NULL)
-		@throw [OFOutOfMemoryException
-		    exceptionWithRequestedSize: numPages * sizeof(struct page)];
-
+	preallocatedPages = of_calloc(numPages, sizeof(struct page));
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	of_tlskey_set(preallocatedPagesKey, preallocatedPages);
 # endif
 
 	for (size_t i = 0; i < numPages; i++)