X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fcontributions%2FSetFocusableHandler.java;h=e6049b5953f9587070df5ac77bc87bf836f3c186;hb=1c4f571d010b7439e006e411f3661a50ee6a4400;hp=b0cfad3c0cb3fc6bfbdf08cf3568420489819c2a;hpb=16ee01dc5a40981c58fd5b478b89552e5814e8bb;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableHandler.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableHandler.java
index b0cfad3c..e6049b59 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableHandler.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableHandler.java
@@ -26,7 +26,7 @@ public class SetFocusableHandler {
     public boolean canExecute(IEclipseContext popupContext, @Named(IServiceConstants.ACTIVE_SELECTION) ISelection selection) {
         @SuppressWarnings("unchecked")
         Collection<IElement> elements = (Collection<IElement>) popupContext.get(SetFocusableDynamicMenuContribution.FOCUSABLE_ELEMENTS);
-        return !elements.isEmpty();
+        return elements != null && !elements.isEmpty();
     }
     
     @Execute