1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
index d1d99084..f5e58998 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
@@ -457,7 +457,10 @@ public abstract class MavenPomEditorPage extends FormPage {
 
   public void dispose() {
     inputHistory.save();
-    getPomEditor().getModel().removeModelStateListener(listener);      
+    MavenPomEditor pe = getPomEditor();
+    if (pe != null && pe.getModel() != null) {
+      pe.getModel().removeModelStateListener(listener);
+    }
     
     super.dispose();
   }