diff --git a/src/UglyToad.PdfPig/Fonts/Parser/Parts/BaseFontCharacterParser.cs b/src/UglyToad.PdfPig/Fonts/Parser/Parts/BaseFontCharacterParser.cs
index f3f9e824..a9818ce9 100644
--- a/src/UglyToad.PdfPig/Fonts/Parser/Parts/BaseFontCharacterParser.cs
+++ b/src/UglyToad.PdfPig/Fonts/Parser/Parts/BaseFontCharacterParser.cs
@@ -13,6 +13,13 @@
             {
                 if (!tokenScanner.MoveNext() || !(tokenScanner.CurrentToken is HexToken inputCode))
                 {
+                    if (tokenScanner.CurrentToken is OperatorToken op
+                    && (string.Equals(op.Data, "endbfchar", StringComparison.OrdinalIgnoreCase) 
+                        || string.Equals(op.Data, "endcmap", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        return;
+                    }
+
                     throw new InvalidOperationException($"Base font characters definition contains invalid item at index {i}: {tokenScanner.CurrentToken}");
                 }