@@ -133,11 +133,11 @@
 	hash = [key hash];
 
 	for (i = hash & (size - 1); i < size && data[i].key != nil &&
 	    ![data[i].key isEqual: key]; i++);
 
-	if (data[i].key == nil)
+	if (i < size && data[i].key == nil)
 		return self;
 
 	/* In case the last bucket is already used */
 	if (i >= size)
 		for (i = 0; i < size && data[i].key != nil &&