diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java
index 35f7c77..ac2a393 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/XSDTextEditor.java
@@ -78,7 +78,8 @@
   {
     super.dispose();
     xsdSelectionManager.removeSelectionChangedListener(this);
-    adapterFactoryLabelProvider = null;
+    // Why is this static?  TODO Make it non-static...
+    //    adapterFactoryLabelProvider = null;
     xsdModelAdapterFactory = null;
   }
   
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSection.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSection.java
index 1ab1582..2b934bc 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSection.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSection.java
@@ -73,8 +73,11 @@
   public void dispose()
   {
     super.dispose();
-    propertySheetPage.dispose();
-    propertySheetPage = null;
+    if (propertySheetPage != null)
+    {
+      propertySheetPage.dispose();
+      propertySheetPage = null;
+    }
   }
 
   /* (non-Javadoc)