diff -r 4dd94d41263c -r f7ef3b61a842 libfaim/aim_conn.c
--- a/libfaim/aim_conn.c	Thu Jun 29 19:38:18 2000 +0000
+++ b/libfaim/aim_conn.c	Thu Jun 29 20:40:28 2000 +0000
@@ -80,6 +80,9 @@
   }
   faim_mutex_unlock(&sess->connlistlock);
 
+  /* XXX: do we need this for txqueue too? */
+  aim_rxqueue_cleanbyconn(sess, *deadconn);
+
   aim_conn_close(*deadconn);
   free(*deadconn);
   deadconn = NULL;
@@ -255,7 +258,8 @@
   faim_mutex_lock(&sess->connlistlock);
   if (sess->connlist == NULL) {
     faim_mutex_unlock(&sess->connlistlock);
-    return 0;
+    *status = -1;
+    return NULL;
   }
   faim_mutex_unlock(&sess->connlistlock);