diff --git a/ChangeLog b/ChangeLog
index ddfe517da..14e391bed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,11 +4,11 @@
 	assertion.
 	(ps_parser_to_bytes): Fix error message.
 
-	* src/type42/t42objs.c (T42_Open_Face): Handle one more error
-	return.
+	* src/type42/t42objs.c (T42_Open_Face): Handle one more error.
 	* src/type42/t42parse.c (t42_parse_sfnts): s/alloc/allocated/.
 	Don't allow mixed binary and hex strings.
 	Handle zero string_size == 0 and string_buf == 0.
+	(t42_parse_encoding): Handle one more error.
 
 2006-06-18  Werner Lemberg  <wl@gnu.org>
 
diff --git a/src/type42/t42parse.c b/src/type42/t42parse.c
index c60b3afc8..714837964 100644
--- a/src/type42/t42parse.c
+++ b/src/type42/t42parse.c
@@ -393,7 +393,7 @@
           break;
         }
 
-        /* check whether we've found an entry */
+        /* check whether we have found an entry */
         if ( ft_isdigit( *cur ) || only_immediates )
         {
           FT_Int  charcode;
@@ -433,7 +433,11 @@
           }
         }
         else
+        {
           T1_Skip_PS_Token( parser );
+          if ( parser->root.error )
+            return;
+        }
 
         T1_Skip_Spaces( parser );
       }