diff --git a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/checktablecombo/CheckTableCombo.java b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/checktablecombo/CheckTableCombo.java
index 57aebe72a..b1fa02619 100644
--- a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/checktablecombo/CheckTableCombo.java
+++ b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/checktablecombo/CheckTableCombo.java
@@ -1677,7 +1677,7 @@ public void removeModifyListener(final ModifyListener listener) {
 		if (listener == null) {
 			SWT.error(SWT.ERROR_NULL_ARGUMENT);
 		}
-		this.removeListener(SWT.Modify, listener);
+		this.removeTypedListener(SWT.Modify, listener);
 	}
 
 	/**
@@ -1699,12 +1699,8 @@ public void removeModifyListener(final ModifyListener listener) {
 	 * @see #addSelectionListener
 	 */
 	public void removeSelectionListener(final SelectionListener listener) {
-		checkWidget();
-		if (listener == null) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		this.removeListener(SWT.Selection, listener);
-		this.removeListener(SWT.DefaultSelection, listener);
+		this.removeTypedListener(SWT.Selection, listener);
+		this.removeTypedListener(SWT.DefaultSelection, listener);
 	}
 
 	/**
@@ -1728,11 +1724,7 @@ public void removeSelectionListener(final SelectionListener listener) {
 	 * @since 3.3
 	 */
 	public void removeVerifyListener(final VerifyListener listener) {
-		checkWidget();
-		if (listener == null) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		this.removeListener(SWT.Verify, listener);
+		this.removeTypedListener(SWT.Verify, listener);
 	}
 
 	/**