             var textFormat:TextFormat = getTextStyles();
             if (textFormat.font)
             {
-                var embeddedFont:EmbeddedFont = getEmbeddedFont(
-                    textFormat.font, textFormat.bold, textFormat.italic);
-                
-                var fontModuleFactory:IFlexModuleFactory = 
+                var fontModuleFactory:IFlexModuleFactory = (noEmbeddedFonts || !embeddedFontRegistry) ? 
+					null : 
                     embeddedFontRegistry.getAssociatedModuleFactory(
-                        embeddedFont, moduleFactory);
+                        textFormat.font, textFormat.bold, textFormat.italic,
+						this, moduleFactory);
     
                 // if we found the font, then it is embedded. 
                 // Some fonts are not listed in info(), so are not in the above registry.

    //  embeddedFontRegistry
    //----------------------------------

    /**
     *  @private
     *  Storage for the _embeddedFontRegistry property.

     */
    private var cachedTextFormat:TextFormat;

    /**
     *  @private
     */
