* src/frame.c (x_set_font): Catch internal error.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/frame.c b/src/frame.c
index 6478ad1e06f..17a99000c9b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3242,6 +3242,9 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
           Lisp_Object ascii_font = fontset_ascii (fontset);
           Lisp_Object spec = font_spec_from_name (ascii_font);
 
+          if (NILP (spec))
+            signal_error ("Invalid font name", ascii_font);
+
           if (! font_match_p (spec, font_object))
             fontset = -1;
         }