diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
index dee054e6300..c9e2dc11e21 100644
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java
@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jsch.core.IJSchService;
 import org.eclipse.osgi.util.NLS;
@@ -924,6 +925,8 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC
 				return session;
 			}
 			return null;
+		} catch (OperationCanceledException e) {
+			throw new RemoteConnectionException(Messages.JSchConnection_0);
 		} catch (JSchException e) {
 			throw new RemoteConnectionException(e.getMessage());
 		}
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java
index 221a3e8664e..fd288be2981 100755
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/Messages.java
@@ -26,6 +26,8 @@ public class Messages extends NLS {
 	public static String GetInputStreamCommand_Receiving;
 
 	public static String GetOutputStreamCommand_Sending;
+	public static String JSchConnection_0;
+
 	public static String JSchConnection_Connection_was_cancelled;
 	public static String JSchConnection_connectionNotOpen;
 	public static String JSchConnection_Executing_command;
diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties
index b9152f94c3c..41b4506556a 100755
--- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties
+++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/messages/messages.properties
@@ -16,6 +16,7 @@ AuthInfo_Authentication_message=Authentication Message
 ExecCommand_Exec_command=Executing command "{0}"
 GetInputStreamCommand_Receiving=Receiving {0}: 
 GetOutputStreamCommand_Sending=Sending {0}: 
+JSchConnection_0=Connection canceled by user
 JSchConnection_Connection_was_cancelled=Connection was cancelled
 JSchConnection_connectionNotOpen=Connection is not open
 JSchConnection_Executing_command=Executing command "{0}"