Index: source/src/texk/web2c/pdftexdir/mapfile.c
===================================================================
--- source/src/texk/web2c/pdftexdir/mapfile.c	(revision 775)
+++ source/src/texk/web2c/pdftexdir/mapfile.c	(working copy)
@@ -288,11 +288,11 @@
         /* do not set variable |a| as this entry will be still accepted */
     }
 
-    /* if ps_name, font file and enc file are missing, drop this entry */
-    if (fm->ps_name == NULL && !is_fontfile(fm) && !is_reencoded(fm)) {
+    /* if for non Type3 font both ps_name and font file are missing, drop this entry */
+    if ((is_type1(fm) || is_truetype(fm) || is_opentype(fm)) && fm->ps_name == NULL && !is_fontfile(fm)) {
         if (warn)
             pdftex_warn
-                ("invalid entry for `%s': ps_name, font file, enc file all missing",
+                ("invalid entry for `%s': both ps_name and font file missing",
                  fm->tfm_name);
         a += 1;
     }
Index: source/src/texk/web2c/pdftexdir/writet3.c
===================================================================
--- source/src/texk/web2c/pdftexdir/writet3.c	(revision 775)
+++ source/src/texk/web2c/pdftexdir/writet3.c	(working copy)
@@ -295,7 +295,7 @@
         t3_char_procs[i] = 0;
         t3_char_widths[i] = 0;
     }
-    fe = fm ? get_fe_entry(fm->encname) : NULL;
+    fe = fm && fm->encname ? get_fe_entry(fm->encname) : NULL;
     glyph_names = fe ? fe->glyph_names : NULL;
     if (glyph_names)
         remove_duplicate_glyph_names(glyph_names, fm->encname);