diff --git a/app/src/cc/arduino/packages/uploaders/SSHUploader.java b/app/src/cc/arduino/packages/uploaders/SSHUploader.java
index 3358501e7..213d7a664 100644
--- a/app/src/cc/arduino/packages/uploaders/SSHUploader.java
+++ b/app/src/cc/arduino/packages/uploaders/SSHUploader.java
@@ -36,6 +36,7 @@ import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 import processing.app.Base;
+import processing.app.I18n;
 import processing.app.Preferences;
 import processing.app.debug.RunnerException;
 import processing.app.debug.TargetPlatform;
@@ -95,6 +96,9 @@ public class SSHUploader extends Uploader {
       if ("Auth cancel".equals(message) || "Auth fail".equals(message)) {
         return false;
       }
+      if (e.getMessage().contains("Connection refused")) {
+        throw new RunnerException(I18n.format("Unable to connect to {0}", port.getAddress()));
+      }
       throw new RunnerException(e);
     } catch (Exception e) {
       throw new RunnerException(e);