1 files changed, 16 insertions, 10 deletions

diff --git a/src/print.c b/src/print.c
index cb340905142..7c3da68fc98 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1135,9 +1135,12 @@ print (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
           ptrdiff_t i;
 
           for (i = 0; i < HASH_TABLE_SIZE (h); ++i)
-            if (!NILP (HASH_HASH (h, i))
-                && EQ (HASH_VALUE (h, i), Qt))
-              Fremhash (HASH_KEY (h, i), Vprint_number_table);
+            {
+              Lisp_Object key =  HASH_KEY (h, i);
+              if (!EQ (key, Qunbound)
+                  && EQ (HASH_VALUE (h, i), Qt))
+                Fremhash (key, Vprint_number_table);
+            }
         }
     }
 
@@ -1593,13 +1596,16 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
 
         printchar ('(', printcharfun);
         for (ptrdiff_t i = 0; i < size; i++)
-          if (!NILP (HASH_HASH (h, i)))
-            {
-              if (i) printchar (' ', printcharfun);
-              print_object (HASH_KEY (h, i), printcharfun, escapeflag);
-              printchar (' ', printcharfun);
-              print_object (HASH_VALUE (h, i), printcharfun, escapeflag);
-            }
+          {
+            Lisp_Object key = HASH_KEY (h, i);
+            if (!EQ (key, Qunbound))
+              {
+                if (i) printchar (' ', printcharfun);
+                print_object (key, printcharfun, escapeflag);
+                printchar (' ', printcharfun);
+                print_object (HASH_VALUE (h, i), printcharfun, escapeflag);
+              }
+          }
 
         if (size < real_size)
           print_c_string (" ...", printcharfun);