diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
index 0cee91f..e46e58e 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
@@ -476,7 +476,7 @@
 	 *            org.eclipse.emf.ecore.EObject
 	 */
 	public boolean featureExists(EObject emfObject) {
-		if (feature == null)
+		if (feature == null || emfObject == null)
 			return false;
 
 		return emfObject.eClass().getEStructuralFeature(feature.getName()) != null;