Fix up message sending

2 files changed, 5 insertions, 2 deletions

diff --git a/chat/BuddyList.py b/chat/BuddyList.py
index 7bf2e4e..edd5f79 100644
--- a/chat/BuddyList.py
+++ b/chat/BuddyList.py
@@ -78,7 +78,8 @@ class BuddyList(object):
 		return None
 
 	def find_buddy_by_address(self, address):
-		for buddy in self._buddies.keys():
+		for buddy_name in self._buddies.keys():
+			buddy = self._buddies[buddy_name]
 			if buddy.address() == address:
 				return buddy
 		return None
diff --git a/chat/chat.py b/chat/chat.py
index b014ee2..da3fda6 100755
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -173,7 +173,9 @@ class ChatActivity(activity.Activity):
 	def _get_current_chat(self):
 		selection = self._buddy_list_view.get_selection()
 		(model, aniter) = selection.get_selected()
-		buddy = model.get_value(aniter, 1)
+		buddy = None
+		if aniter:
+			buddy = model.get_value(aniter, 1)
 		if not buddy:
 			return self._group_chat
 		return buddy.chat()