X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fgvoice%2Faddressbook.py;h=8efb26f679da5eac00a6428a5367817949832028;hp=dbb8ed9a3663618805f9f5925cf37e90368f2299;hb=b71048b78ae57f1d4f32189f106838188d4a777b;hpb=93296488a75e77299c484e6d7c57b08c4d34930d

diff --git a/src/gvoice/addressbook.py b/src/gvoice/addressbook.py
index dbb8ed9..8efb26f 100644
--- a/src/gvoice/addressbook.py
+++ b/src/gvoice/addressbook.py
@@ -47,13 +47,22 @@ class Addressbook(object):
 		return self._numbers.iterkeys()
 
 	def get_contact_name(self, strippedNumber):
+		"""
+		@throws KeyError if contact not in list (so client can choose what to display)
+		"""
 		return self._numbers[strippedNumber][0]
 
 	def get_phone_type(self, strippedNumber):
-		return self._numbers[strippedNumber][1]
+		try:
+			return self._numbers[strippedNumber][1]
+		except KeyError:
+			return "unknown"
 
 	def is_blocked(self, strippedNumber):
-		return self._numbers[strippedNumber][1]["response"] == self._RESPONSE_BLOCKED
+		try:
+			return self._numbers[strippedNumber][1]["response"] == self._RESPONSE_BLOCKED
+		except KeyError:
+			return False
 
 	def _populate_contacts(self):
 		if self._numbers: