  
  	fontdesc->font->ft_substitute = 1;
  	fontdesc->font->ft_bold = bold && !ft_is_bold(fontdesc->font->ft_face);
-@@ -219,7 +229,12 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fon
- 		fz_throw(ctx, "cannot find builtin CJK font");
+@@ -223,7 +233,12 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fon
+ 		fz_throw(ctx, FZ_ERROR_GENERIC, "cannot find builtin CJK font");
  
  	/* a glyph bbox cache is too big for droid sans fallback (51k glyphs!) */
 +#ifndef NOBUILTINFONT

 #ifdef NOCJK
 #define NOCJKFONT
 #endif
@@ -152,3 +154,112 @@ pdf_lookup_substitute_cjk_font(int ros, int serif, unsigned int *len)
 	return NULL;
 #endif
 }

 
 	fontdesc->font->ft_substitute = 1;
 }
diff --git a/source/pdf/pdf-fontfile.c b/source/pdf/pdf-fontfile.c
index c9990da..9c091a7 100644
--- a/source/pdf/pdf-fontfile.c
+++ b/source/pdf/pdf-fontfile.c
@@ -14,6 +14,8 @@
 	Set NODROIDFONT to use the base 14 fonts as substitute fonts.
 */
 
