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=refs%2Fchanges%2F29%2F3029%2F1;hp=8fe597cad4f760a58dcf82636a594a8c88eb44ae;hpb=a460e609147d064dd3da464bcf1626845e0f93b4;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 8fe597ca..26a32397 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
@@ -54,7 +54,7 @@ public abstract class PipelineComponent extends GeometryNode {
 	}
 	
 	@RelatedGetObj(Plant3D.URIs.HasAlternativePipeRun)
-	public PipeRun getAlternaitvePipeRun() {
+	public PipeRun getAlternativePipeRun() {
 		return alternativePipeRun;
 	}
 	
@@ -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())