diff --git a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java index 9ce78756b0f..d441997cd61 100644 --- a/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java +++ b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java @@ -123,9 +123,15 @@ public class RemoteServicesUtils { conn = services.getConnectionManager().getConnection(connName); } else if (connName != null) { for (RemoteServicesDescriptor proxy : RemoteServicesImpl.getRemoteServiceDescriptors()) { - conn = proxy.getServices().getConnectionManager().getConnection(connName); - if (conn != null) { - break; + services = proxy.getServices(); + if (services != null) { + IRemoteConnectionManager connMgr = services.getConnectionManager(); + if (connMgr != null) { + conn = connMgr.getConnection(connName); + if (conn != null) { + break; + } + } } } }