1 files changed, 12 insertions, 4 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index bd08871f278..e93531e1f59 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7071,10 +7071,18 @@ realize_default_face (f)
 #ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS
   if (face->font != FRAME_FONT (f))
-    /* As the font specified for the frame was not acceptable as a
-       font for the default face (perhaps because auto-scaled fonts
-       are rejected), we must adjust the frame font.  */
-    x_set_font (f, build_string (face->font_name), Qnil);
+    {
+      /* This can happen when making a frame on a display that does
+         not support the default font.  */
+      if (!face->font)
+        return 0;
+
+      /* Otherwise, the font specified for the frame was not
+         acceptable as a font for the default face (perhaps because
+         auto-scaled fonts are rejected), so we must adjust the frame
+         font.  */
+      x_set_font (f, build_string (face->font_name), Qnil);
+    }
 #endif  /* HAVE_X_WINDOWS */
 #endif  /* HAVE_WINDOW_SYSTEM */
   return 1;