diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php
index b662afcd..6d882ec5 100644
--- a/data/LanguageNameSearch.php
+++ b/data/LanguageNameSearch.php
@@ -28,11 +28,17 @@ class LanguageNameSearch {
 		if ( self::$languagenames === null ) {
 			self::init();
 		}
+
+		// @todo: Shouldn't this be unicode aware?
 		$searchKey = strtolower( $searchKey );
-		$bucket = self::$languagenames[self::getIndex( $searchKey )];
-		if ( !$bucket ) {
+		$index = self::getIndex( $searchKey );
+
+		if ( !isset( self::$languagenames[$index] ) ) {
 			return array();
 		}
+
+		$bucket = self::$languagenames[$index];
+
 		$results = array();
 		foreach ( $bucket as $name => $code ) {
 			// Prefix search
@@ -55,9 +61,6 @@ class LanguageNameSearch {
 		} else {
 			$bucket = $codepoint % 1000;
 		}
-		if ( !isset( $buckets[$bucket] ) ) {
-			$buckets[$bucket] = array();
-		}
 
 		return $bucket;
 	}