diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index f390391..e46e670 100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -62,7 +62,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
     char	*ptr;
     FILE       *file;
     int         count,
-                i,
+                num_fonts,
                 status;
     struct stat	statb;
     static char format[24] = "";
@@ -101,12 +101,12 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
             fclose(file);
 	    return BadFontPath;
         }
-	count = fscanf(file, "%d\n", &i);
+	count = fscanf(file, "%d\n", &num_fonts);
 	if ((count == EOF) || (count != 1)) {
 	    fclose(file);
 	    return BadFontPath;
 	}
-	dir = FontFileMakeDir(directory, i);
+	dir = FontFileMakeDir(directory, num_fonts);
 	if (dir == NULL) {
 	    fclose(file);
 	    return BadFontPath;
@@ -131,7 +131,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
 	    if (FontFileAddFontFile (dir, font_name, file_name))
 		found_font = TRUE;
 	}
-	if (!found_font) {
+	if (!found_font && (num_fonts > 0)) {
 	    FontFileFreeDir (dir);
 	    fclose(file);
 	    return BadFontPath;