From a285d09459112f1103811a66b6c40ca9759f51fe Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 20 Mar 2024 20:07:03 +0530
Subject: [PATCH] ...

---
 kitty/core_text.m | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kitty/core_text.m b/kitty/core_text.m
index e3ebd24cb..078d81ae5 100644
--- a/kitty/core_text.m
+++ b/kitty/core_text.m
@@ -240,10 +240,9 @@ find_substitute_face(CFStringRef str, CTFontRef old_font, CPUCell *cpu_cell) {
         CTFontRef new_font = CTFontCreateForString(old_font, str, CFRangeMake(start, amt));
         if (amt == len && len != 1) amt = 1;
         else start++;
-        if (new_font == NULL) { PyErr_SetString(PyExc_ValueError, "Failed to find fallback CTFont"); return NULL; }
         if (new_font == old_font) { CFRelease(new_font); continue; }
-        if (is_last_resort_font(new_font)) {
-            CFRelease(new_font);
+        if (!new_font || is_last_resort_font(new_font)) {
+            if (new_font) CFRelease(new_font);
             if (is_private_use(cpu_cell->ch)) {
                 // CoreTexts fallback font mechanism does not work for private use characters
                 new_font = manually_search_fallback_fonts(old_font, cpu_cell);