2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 837203f305c..b5dd3f2f359 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-26  Kelvin White  <kwhite@gnu.org>
+
+        * erc.el (erc-format-nick): Fix code regression - Bug #18551
+
 2014-09-25  Kelvin White  <kwhite@gnu.org>
 
         * erc.el: Follow Emacs version instead of tracking it seperately.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index f4d9dd3c652..1c832a5fdfa 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4225,11 +4225,12 @@ and as second argument the event parsed as a vector."
 (defun erc-format-nick (&optional user _channel-data)
   "Return the nickname of USER.
 See also `erc-format-nick-function'."
-  (let ((nick (erc-server-user-nickname user)))
+  (when user
+    (let ((nick (erc-server-user-nickname user)))
     (concat (erc-propertize
              (erc-get-user-mode-prefix nick)
              'face 'erc-nick-prefix-face)
-            nick)))
+            nick))))
 
 (defun erc-get-user-mode-prefix (user)
   (when user