diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java
index aca9e0c..3127c4a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ArtifactEdit.java
@@ -490,7 +490,7 @@
 	 */
 	public void removeListener(EditModelListener listener) {
 		if(isBinary()){
-		} else if (artifactEditModel!=null) {
+		} else if (artifactEditModel!=null && !artifactEditModel.isDisposed()) {
 			artifactEditModel.removeListener(listener);
 		}
 	}