diff --git a/features/org.eclipse.xsd-feature/feature.xml b/features/org.eclipse.xsd-feature/feature.xml
index a12bb81..9c6bce4 100644
--- a/features/org.eclipse.xsd-feature/feature.xml
+++ b/features/org.eclipse.xsd-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.9.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.7.0.qualifier">
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index 40f090c..32ccf97 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.xml
+++ b/features/org.eclipse.xsd.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.sdk"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.9.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.7.0.qualifier">
diff --git a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
index 0e4b92f..3338e25 100644
--- a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd; singleton:=true
-Bundle-Version: 2.9.0.qualifier
+Bundle-Version: 2.9.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.XSDPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java
index 3b6c562..8d4c0f2 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDConstants.java
@@ -1424,7 +1424,7 @@
     }
 
     Element leaf = null;
-    for (; node.getNodeType() == Node.ELEMENT_NODE; node = node.getParentNode())
+    for (; node != null && node.getNodeType() == Node.ELEMENT_NODE; node = node.getParentNode())
     {
       Element elementNode = (Element)node;
       if (leaf == null)