X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FPipelineComponent.java;h=26a3239700657c78aa7085c14332dc1ecac7ac61;hb=84132a1d750c45f9161afbd58b78572964e50d26;hp=03caa9815dfcf08dcc16394332b89d13719b0a70;hpb=86739231beb0535bde4abae49d2011e3a042810b;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
index 03caa981..26a32397 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
@@ -299,12 +299,13 @@ public abstract class PipelineComponent extends GeometryNode {
 	@Override
 	public void remove() {
 		PipeControlPoint pcp = getControlPoint();
-		if (pcp != null) {
+		// Second check is needed, when remove process is initiated from control point.
+		if (pcp != null && pcp.getPipelineComponent() != null) {
 			pcp.remove();
 		}
 		super.remove();
 	}
-	
+
 	@Override
 	protected double[] getColor() {
 		if (getControlPoint() == null || !getControlPoint().isFixed())