Index: kernel/generic/src/adt/cht.c
===================================================================
--- kernel/generic/src/adt/cht.c	(revision c28413a9016657d3ac6987b6caf3bccd6680c48d)
+++ kernel/generic/src/adt/cht.c	(revision 5d230a30bd6fd0cd7ce41aa27f5139fe2bae2fb3)
@@ -617,4 +617,13 @@
 void cht_destroy(cht_t *h)
 {
+	cht_destroy_unsafe(h);
+	
+	/* You must clear the table of items. Otherwise cht_destroy will leak. */
+	ASSERT(atomic_get(&h->item_cnt) == 0);
+}
+
+/** Destroys a successfully created CHT but does no error checking. */
+void cht_destroy_unsafe(cht_t *h)
+{
 	/* Wait for resize to complete. */
 	while (0 < atomic_get(&h->resize_reqs)) {
@@ -627,7 +636,4 @@
 	free(h->b);
 	h->b = NULL;
-	
-	/* You must clear the table of items. Otherwise cht_destroy will leak. */
-	ASSERT(atomic_get(&h->item_cnt) == 0);
 }