[Telepathy-commits] [telepathy-glib/master] tp_base_connection_dbus_request_handles: critical rather than asserting if type is wrong

[Simon McVittie]

---
 telepathy-glib/base-connection.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index f806020..04c8e7b 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -2341,15 +2341,14 @@ tp_base_connection_dbus_request_handles (TpSvcConnection *iface,
   GArray *handles = NULL;
   gchar *sender;
 
+  g_return_if_fail (TP_IS_BASE_CONNECTION (self));
+  TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (self, context);
+
   for (cur_name = names; *cur_name != NULL; cur_name++)
     {
       count++;
     }
 
-  g_assert (TP_IS_BASE_CONNECTION (self));
-
-  TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (self, context);
-
   if (!tp_handle_type_is_valid (handle_type, &error))
     {
       g_assert (error != NULL);
-- 
1.5.6.5