X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Faliasing.py;h=9d7662975c3d88d48dde8a3e864993a0e1a196d9;hp=4d6c3a338371cd61a79540388e468a28280543d9;hb=a155f411693fab94319c44c8419e21a7edbe4fd6;hpb=7185ab0e9bc773f7c7051d414ae0af578060a583

diff --git a/src/aliasing.py b/src/aliasing.py
index 4d6c3a3..9d76629 100644
--- a/src/aliasing.py
+++ b/src/aliasing.py
@@ -106,7 +106,7 @@ class AliasingMixin(telepathy.server.ConnectionInterfaceAliasing):
 		for handleId, alias in aliases.iteritems():
 			h = self.handle(telepathy.HANDLE_TYPE_CONTACT, handleId)
 			if not isinstance(h, handle.ConnectionHandle):
-				raise telepathy.PermissionDenied("No user customizable aliases")
+				raise telepathy.errors.PermissionDenied("No user customizable aliases")
 			userHandleAndAlias = h, alias
 		if userHandleAndAlias is None:
 			_moduleLogger.debug("No user handle")
@@ -127,5 +127,9 @@ class AliasingMixin(telepathy.server.ConnectionInterfaceAliasing):
 			userAlias = make_pretty(callbackNumber)
 			return userAlias
 		else:
-			contactAlias = self.session.addressbook.get_contact_name(h.contactID)
+			contactId = h.contactID
+			if contactId:
+				contactAlias = self.session.addressbook.get_contact_name(contactId)
+			else:
+				contactAlias = make_pretty(h.phoneNumber)
 			return contactAlias