diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/PreSetValidationListeners.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/PreSetValidationListeners.java
index b9d6dd5..282d09b 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/PreSetValidationListeners.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/PreSetValidationListeners.java
@@ -383,10 +383,12 @@
 		}
 
 		private void start() {
-			if (control instanceof Text) {
-				((Text) control).addVerifyListener(this);
-			} else if (control instanceof Combo) {
-				((Combo) control).addVerifyListener(this);
+			if (control != null && !control.isDisposed()) {
+				if (control instanceof Text) {
+					((Text) control).addVerifyListener(this);
+				} else if (control instanceof Combo) {
+					((Combo) control).addVerifyListener(this);
+				}
 			}
 		}