1 files changed, 8 insertions, 1 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 327713942fb..371f4c3089e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2739,7 +2739,14 @@ modify_event_symbol (symbol_num, modifiers, symbol_kind, name_table,
   if (NILP (*slot))
     {
       /* No; let's create it.  */
-      *slot = intern (name_table[symbol_num]);
+      if (name_table[symbol_num])
+        *slot = intern (name_table[symbol_num]);
+      else
+        {
+          char buf[20];
+          sprintf (buf, "key-%d", symbol_num);
+          *slot = intern (buf);
+        }
 
       /* Fill in the cache entries for this symbol; this also   
          builds the Qevent_symbol_elements property, which the user