Index: kernel/generic/src/adt/btree.c
===================================================================
--- kernel/generic/src/adt/btree.c	(revision 0b4a67a31961a80515a7b28d5b2e27fbb8f7249d)
+++ kernel/generic/src/adt/btree.c	(revision 3a4b3bad74b51aef577f2e38649da421f223b85b)
@@ -888,4 +888,7 @@
 		*leaf_node = cur;
 		
+		if (cur->keys == 0)
+			return NULL;
+
 		/*
 		 * The key can be in the leftmost subtree.
@@ -926,5 +929,5 @@
 				return key == cur->key[i - 1] ? val : NULL;
 		}
-		descend:
+descend:
 		;
 	}