1 files changed, 5 insertions, 2 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index 81a6a953aa5..8ca9e40d7d2 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -374,8 +374,11 @@ completely specified)."
       ;; VALUE is relative, so merge with inherited faces
       (let ((inh-from (face-attribute face :inherit frame)))
         (unless (or (null inh-from) (eq inh-from 'unspecified))
-          (setq value
-                (face-attribute-merged-with attribute value inh-from frame)))))
+          (condition-case nil
+              (setq value
+                    (face-attribute-merged-with attribute value inh-from frame))
+            ;; The `inherit' attribute may point to non existent faces.
+            (error nil)))))
     (when (and inherit
                (not (eq inherit t))
                (face-attribute-relative-p attribute value))