diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index dc572b0a89..1b9c06726d 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -110,7 +110,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 
         else if (c == '<')  
 	    {
-            wxHtmlTag tag(m_Source, i, end_pos, m_Cache);
+            wxHtmlTag tag(m_Source, i, end_pos, m_Cache, m_entitiesParser);
 
             if (templen) 
 	        {
diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 8801b15227..52e0c1b8f8 100644
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -206,7 +206,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos,
                 else if (state == ST_VALUE && quote == 0)
                 {
                     m_ParamNames.Add(pname);
-                    m_ParamValues.Add(entParser->Parse(pvalue));
+                    if (entParser)
+                        m_ParamValues.Add(entParser->Parse(pvalue));
+                    else
+                        m_ParamValues.Add(pvalue);
                 }
                 break;
             }
@@ -259,7 +262,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos,
                             //     but wxHTML code relies on this... :(
                             pvalue.MakeUpper();
                         }
-                        m_ParamValues.Add(entParser->Parse(pvalue));
+                        if (entParser)
+                            m_ParamValues.Add(entParser->Parse(pvalue));
+                        else
+                            m_ParamValues.Add(pvalue);
                         state = ST_BEFORE_NAME;
                     }
                     else