diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java
index d27d6c762..989fe9947 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/Figure.java
@@ -1370,7 +1370,7 @@ protected void primTranslate(int dx, int dy) {
 	 */
 	@Override
 	public void remove(IFigure figure) {
-		if ((figure.getParent() != this)) {
+		if (figure == null || figure.getParent() != this) {
 			throw new IllegalArgumentException("Figure is not a child"); //$NON-NLS-1$
 		}
 		if (getFlag(FLAG_REALIZED)) {