1 files changed, 6 insertions, 0 deletions

diff --git a/src/data.c b/src/data.c
index 2f41d4ee60f..24ee967d303 100644
--- a/src/data.c
+++ b/src/data.c
@@ -101,6 +101,12 @@ wrong_type_argument (predicate, value)
          if (INTEGERP (value) && EQ (predicate, Qstringp))
            return Fnumber_to_string (value);
         }
+
+      /* If VALUE is not even a valid Lisp object, abort here
+         where we can get a backtrace showing where it came from.  */
+      if ((unsigned int) XGCTYPE (value) > Lisp_Window + 2)
+        abort ();
+
       value = Fsignal (Qwrong_type_argument, Fcons (predicate, Fcons (value, Qnil)));
       tem = call1 (predicate, value);
     }