davideme · dotbill · Feb 15, 2013 · Feb 15, 2013 · Apr 23, 2013 · May 22, 2013
diff --git a/PhoneNumberUtil.php b/PhoneNumberUtil.php
@@ -233,7 +233,10 @@ private function init($filePrefix) {
 		foreach ($this->countryCallingCodeToRegionCodeMap as $regionCodes) {
 			$this->supportedRegions = array_merge($this->supportedRegions, $regionCodes);
 		}
-		unset($this->supportedRegions[array_search(self::REGION_CODE_FOR_NON_GEO_ENTITY, $this->supportedRegions)]);
+		$unsupportedRegionIndex = array_search(self::REGION_CODE_FOR_NON_GEO_ENTITY, $this->supportedRegions);
+		if ($unsupportedRegionIndex !== false) {
+			unset($this->supportedRegions[$unsupportedRegionIndex]);
+		}
 		$this->nanpaRegions = $this->countryCallingCodeToRegionCodeMap[self::NANPA_COUNTRY_CODE];
 	}
 

diff --git a/data/PhoneNumberMetadataForTesting_800.php b/data/PhoneNumberMetadataForTesting_800.php
diff --git a/data/PhoneNumberMetadataForTesting_979.php b/data/PhoneNumberMetadataForTesting_979.php
diff --git a/data/PhoneNumberMetadataForTesting_AD.php b/data/PhoneNumberMetadataForTesting_AD.php
diff --git a/data/PhoneNumberMetadataForTesting_AO.php b/data/PhoneNumberMetadataForTesting_AO.php