X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-message.el;h=c943e50ce5910c359fe93f020115041984a56080;hb=10e7ff663eee9d7e2038a3180f2dbb8eb02e36d5;hp=0ed460225a7242860c05e688c0abfff3898859fa;hpb=c63c8dbd3ecdedb1d9da78546b252b6dc1c4e46d;p=riece

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 0ed4602..c943e50 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -114,7 +114,7 @@
 		  (riece-message-target message))))
     (unless (riece-identity-member target riece-current-channels)
       (riece-join-channel target)
-      ;; If you are not joined any channel,
+      ;; If you are not joined to any channel,
       ;; switch to the target immediately.
       (unless riece-current-channel
 	(riece-switch-to-channel target)))
@@ -181,7 +181,7 @@ Normally they are *Dialogue* and/or *Others*."
   "Display MESSAGE object."
   (let ((functions riece-message-filter-functions))
     (setq message (copy-sequence message))
-    (while functions
+    (while (and functions message)
       (setq message (funcall (car functions) message)
 	    functions (cdr functions)))
     (if message