X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-server.el;h=859cf1e8a0c18eacd3e1b4e526e304a6641f5716;hp=4d5b2449a4629ff0aa90d16bed2ed293714bd3cd;hb=e97555fd5e2b50919980ce005610f842d7825caa;hpb=94fa2d50fb28c3f6b31b6f7e5cb1464b9ba065c6

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 4d5b244..859cf1e 100644
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -196,8 +196,9 @@ If optional argument SERVICE is non-nil, open by the service name."
   (let ((riece-overriding-server-name server-name)
 	(channels riece-current-channels))
     (while channels
-      (if (equal (riece-identity-server (car channels))
-		 server-name)
+      (if (and (car channels)
+	       (equal (riece-identity-server (car channels))
+		      server-name))
 	  (riece-part-channel (car channels)))
       (setq channels (cdr channels)))
     (riece-redisplay-buffers))