diff --git a/src/keyboard.c b/src/keyboard.c
index 108333e37e6..d3b153f1d6e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3195,10 +3195,11 @@ modify_event_symbol (symbol_num, modifiers, symbol_kind, name_alist,
     {
       /* No; let's create it.  */
       if (!NILP (name_alist))
-	value = Fassq (symbol_int, name_alist);
+	value = Fcdr_safe (Fassq (symbol_int, name_alist));
       else if (name_table[symbol_num])
 	value = intern (name_table[symbol_num]);
-      else
+
+      if (NILP (value))
 	{
 	  char buf[20];
 	  sprintf (buf, "key-%d", symbol_num);