1 files changed, 8 insertions, 8 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 237bc0db9df..f67cc109e87 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1643,13 +1643,12 @@ specified buffer position instead of point are used.
 
       /* We are not interested in locations without event data */
 
-      if (EVENT_HAS_PARAMETERS (event)) {
-        Lisp_Object kind;
-
-        kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
-        if (EQ (kind, Qmouse_click))
-          position = EVENT_START (event);
-      }
+      if (EVENT_HAS_PARAMETERS (event))
+        {
+          Lisp_Object kind = EVENT_HEAD_KIND (EVENT_HEAD (event));
+          if (CONSP (XCDR (event)) && EQ (kind, Qmouse_click))
+            position = EVENT_START (event);
+        }
     }
 
   /* Key sequences beginning with mouse clicks
@@ -1742,7 +1741,8 @@ specified buffer position instead of point are used.
               
               pos = XCDR (string);
               string = XCAR (string);
-              if (XINT (pos) >= 0
+              if (INTEGERP (pos)
+                  && XINT (pos) >= 0
                   && XINT (pos) < SCHARS (string))
                 {
                   map = Fget_text_property (pos, Qlocal_map, string);