diff --git a/source/com/intellij/ide/highlighter/HtmlFileType.java b/source/com/intellij/ide/highlighter/HtmlFileType.java
index 59f24da468d8..4b990b06ca2e 100644
--- a/source/com/intellij/ide/highlighter/HtmlFileType.java
+++ b/source/com/intellij/ide/highlighter/HtmlFileType.java
@@ -32,7 +32,6 @@
 package com.intellij.ide.highlighter;
 
 import com.intellij.codeFormatting.PseudoTextBuilder;
-import com.intellij.codeFormatting.xml.html.HtmlPseudoTextBuilder;
 import com.intellij.ide.structureView.StructureViewModel;
 import com.intellij.ide.structureView.impl.xml.XmlStructureViewTreeModel;
 import com.intellij.openapi.fileTypes.FileType;
@@ -120,11 +119,11 @@ public class HtmlFileType implements FileType {
   }
 
   public PseudoTextBuilder getPseudoTextBuilder() {
-    return new HtmlPseudoTextBuilder();
+    //return new HtmlPseudoTextBuilder();
+    return null;
   }
 
   public StructureViewModel getStructureViewModel(VirtualFile file, Project project) {
-    //return new XmlStructureViewTreeModel((XmlFile)PsiManager.getInstance(project).findFile(file));
-    return null;
+    return new XmlStructureViewTreeModel((XmlFile)PsiManager.getInstance(project).findFile(file));
   }
 }
\ No newline at end of file
diff --git a/source/com/intellij/ide/util/treeView/smartTree/SmartTreeStructure.java b/source/com/intellij/ide/util/treeView/smartTree/SmartTreeStructure.java
index 947a3db5c842..33c72a682600 100644
--- a/source/com/intellij/ide/util/treeView/smartTree/SmartTreeStructure.java
+++ b/source/com/intellij/ide/util/treeView/smartTree/SmartTreeStructure.java
@@ -4,6 +4,7 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.AbstractTreeStructure;
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.diagnostic.Logger;
 
 public class SmartTreeStructure extends AbstractTreeStructure {
 
@@ -11,7 +12,12 @@ public class SmartTreeStructure extends AbstractTreeStructure {
   private final Project myProject;
   private TreeElementWrapper myRootElementWrapper;
 
+  private static Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.smartTree.SmartTreeStructure");
+
   public SmartTreeStructure(Project project, TreeModel model) {
+
+    LOG.assertTrue(model != null);
+
     myModel = model;
     myProject = project;