1 files changed, 5 insertions, 1 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index 18e5d9a6119..6373100484a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1192,7 +1192,7 @@ load_pixmap (f, name, w_ptr, h_ptr)
 
   if (bitmap_id < 0)
     {
-      add_to_log ("Invalid or undefined bitmap %s", name, Qnil);
+      add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil);
       bitmap_id = 0;
 
       if (w_ptr)
@@ -5734,6 +5734,8 @@ lookup_named_face (f, symbol, c, signal_p)
       if (!realize_basic_faces (f))
         return -1;
       default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+      if (default_face == NULL)
+        abort ();  /* realize_basic_faces must have set it up  */
     }
 
   if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p))
@@ -6238,6 +6240,8 @@ face for italic.  */)
       if (! realize_basic_faces (f))
         error ("Cannot realize default face");
       def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+      if (def_face == NULL)
+        abort ();  /* realize_basic_faces must have set it up  */
     }
 
   /* Dispatch to the appropriate handler.  */