X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Felement%2FElementUtils.java;h=465db5e934d7efe01fe5e5bae3778c9187a8f7c3;hp=300e74d31e75e04ee7ecf750ab0b2e58ba513951;hb=27f08248fa2471dab6bce315387b9617fcfeb1ea;hpb=6ff5e65793559d92443fcd1eb7e8d12a3bed9e9e

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementUtils.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementUtils.java
index 300e74d31..465db5e93 100644
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementUtils.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/element/ElementUtils.java
@@ -258,8 +258,10 @@ public class ElementUtils {
     public static Collection<Terminal> getTerminals(IElement e, Collection<Terminal> result, boolean clearResult) {
         if (clearResult)
             result.clear();
-        TerminalTopology tt = e.getElementClass().getSingleItem(TerminalTopology.class);
-        tt.getTerminals(e, result);
+        TerminalTopology tt = e.getElementClass().getAtMostOneItemOfClass(TerminalTopology.class);
+        if (tt != null) {
+            tt.getTerminals(e, result);
+        }
         return result;
     }