diff --git a/src/Graphics/Fonts/font_database.cpp b/src/Graphics/Fonts/font_database.cpp
index b8492e907e..12308c3abd 100644
--- a/src/Graphics/Fonts/font_database.cpp
+++ b/src/Graphics/Fonts/font_database.cpp
@@ -687,13 +687,13 @@ font_database_load_suffixes () {
     tree t= block_to_scheme_tree (s);
     for (int i= 0; i < N (t); i++)
       if (is_func (t[i], TUPLE, 2)) {
-        // if (&ftab == &font_table)
         tree family_style= t[i][0];
         tree files       = t[i][1];
         for (int j= 0; j < N (files); j++) {
           url    file_name= url (files[j][0]->label);
           string base_name= basename (file_name);
           string suf      = suffix (file_name);
+          if (is_empty (suf)) continue;
           if (font_suffixes->contains (base_name)) {
             array<string> sufs= font_suffixes[base_name];
             if (!contains (suf, sufs)) {
diff --git a/src/Plugins/Freetype/tt_file.cpp b/src/Plugins/Freetype/tt_file.cpp
index 76c99b24bc..563c6621c6 100644
--- a/src/Plugins/Freetype/tt_file.cpp
+++ b/src/Plugins/Freetype/tt_file.cpp
@@ -191,6 +191,9 @@ tt_font_find_sub (string name) {
     if (!is_none (u)) return u;
   }
   else {
+    debug_fonts << "Font " << name << " does not exist in font database" << LF;
+    debug_fonts << "Please report it to us if it is a ttf/ttc/otf font!" << LF;
+    debug_fonts << "Locating it as " * name * ".pfb, might be slow :(" << LF;
     // If the font is not in font database
     // It must not be a ttf/ttc/otf/tfm font
     u= tt_locate_pfb (name);