diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
index 6688422..cb683b8 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
@@ -532,8 +532,12 @@
 	 * {@inheritDoc}
 	 */
 	public void setEditable(boolean isEditable) {
-		addButton.setVisible(isEditable);
-		removeButton.setVisible(isEditable);
+		if (addButton != null) {
+			addButton.setVisible(isEditable);
+		}
+		if (removeButton != null) {
+			removeButton.setVisible(isEditable);
+		}
 		editable = isEditable;
 	}