1 files changed, 19 insertions, 20 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/propertytesters/ConnectionPropertyTester.java b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/propertytesters/ConnectionPropertyTester.java
index 627ecd1193..9bd1f0c445 100644
--- a/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/propertytesters/ConnectionPropertyTester.java
+++ b/containers/org.eclipse.linuxtools.docker.ui/src/org/eclipse/linuxtools/internal/docker/ui/propertytesters/ConnectionPropertyTester.java
@@ -47,28 +47,27 @@ public class ConnectionPropertyTester extends PropertyTester {
 
 	private boolean isConnectionEstablished(Object receiver, String property,
 			Object[] args, Object expectedValue) {
-		if (receiver instanceof List) {
-			if (!((List<?>) receiver).isEmpty()) {
-				return isConnectionEstablished(((List<?>) receiver).get(0),
-						property, args, expectedValue);
-			} else {
-				return isConnectionEstablished(
-						DockerConnectionWatcher.getInstance().getConnection(),
-						property, args,
-						expectedValue);
+		try {
+			if (receiver instanceof List) {
+				if (!((List<?>) receiver).isEmpty()) {
+					return isConnectionEstablished(((List<?>) receiver).get(0), property, args, expectedValue);
+				} else {
+					return isConnectionEstablished(DockerConnectionWatcher.getInstance().getConnection(), property,
+							args, expectedValue);
+				}
 			}
-		}
-		if (receiver instanceof IAdaptable) {
-			final IDockerConnection connection = ((IAdaptable) receiver)
-					.getAdapter(IDockerConnection.class);
-			if (connection != null) {
-				return isConnectionEstablished(connection, property, args,
-						expectedValue);
+			if (receiver instanceof IAdaptable) {
+				final IDockerConnection connection = ((IAdaptable) receiver).getAdapter(IDockerConnection.class);
+				if (connection != null) {
+					return isConnectionEstablished(connection, property, args, expectedValue);
+				}
 			}
-		}
-		if (receiver instanceof IDockerConnection) {
-			return expectedValue.equals(((IDockerConnection) receiver)
-					.getState() == EnumDockerConnectionState.ESTABLISHED);
+			if (receiver instanceof IDockerConnection) {
+				return expectedValue
+						.equals(((IDockerConnection) receiver).getState() == EnumDockerConnectionState.ESTABLISHED);
+			}
+		} catch (Exception e) {
+			// do nothing and fall through
 		}
 		return false;
 	}