diff --git a/collects/mred/private/wx/win32/font.rkt b/collects/mred/private/wx/win32/font.rkt
index cf7a4616..45e6ff7c 100644
--- a/collects/mred/private/wx/win32/font.rkt
+++ b/collects/mred/private/wx/win32/font.rkt
@@ -18,7 +18,9 @@
   (let* ([pfont (pango_font_map_load_font display-font-map
                                           display-context
                                           (send f get-pango))]
-         [logfont (pango_win32_font_logfont pfont)])
-    (begin0
-     (pango_win32_font_cache_load font-cache logfont)
-     (g_free logfont))))
+         [logfont (and pfont
+		       (pango_win32_font_logfont pfont))])
+    (and logfont
+	 (begin0
+	  (pango_win32_font_cache_load font-cache logfont)
+	  (g_free logfont)))))
diff --git a/collects/mred/private/wx/win32/window.rkt b/collects/mred/private/wx/win32/window.rkt
index 13f958c0..f83bb9f5 100644
--- a/collects/mred/private/wx/win32/window.rkt
+++ b/collects/mred/private/wx/win32/window.rkt
@@ -338,7 +338,8 @@
     (unless theme-hfont
       (set! theme-hfont (CreateFontIndirectW (get-theme-logfont))))
     (let ([hfont (if font
-                     (font->hfont font)
+                     (or (font->hfont font)
+			 theme-hfont)
                      theme-hfont)])
       (SendMessageW hwnd WM_SETFONT (cast hfont _HFONT _LPARAM) 0)))