diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index e9977cd..6f6e319 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1007,6 +1007,9 @@ empathy_tp_chat_send (EmpathyTpChat *chat,
 	message_body = empathy_message_get_body (message);
 	message_type = empathy_message_get_type (message);
 
+	if (!tp_channel_run_until_ready (priv->channel, NULL, NULL))
+		return;
+
 	empathy_debug (DEBUG_DOMAIN, "Sending message: %s", message_body);
 	tp_cli_channel_type_text_call_send (priv->channel, -1,
 					    message_type,
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index f506760..f8a21b2 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -1099,10 +1099,13 @@
   (return-type "GType")
 )
 
-(define-method store_new
-  (of-object "EmpathyContactList")
+(define-function empathy_contact_list_store_new
+  (is-constructor-of "EmpathyContactListStore")
   (c-name "empathy_contact_list_store_new")
   (return-type "EmpathyContactListStore*")
+  (parameters
+    '("EmpathyContactList*" "list_iface")
+  )
 )
 
 (define-method get_list_iface