diff --git a/lib/vagrant/ssh.rb b/lib/vagrant/ssh.rb
index f00093fd7..800753ac6 100644
--- a/lib/vagrant/ssh.rb
+++ b/lib/vagrant/ssh.rb
@@ -31,7 +31,7 @@ module Vagrant
         end
 
         false
-      rescue Errno::ECONNREFUSED
+      rescue Errno::ECONNREFUSED, Net::SSH::Disconnect
         false
       end
 
diff --git a/test/vagrant/ssh_test.rb b/test/vagrant/ssh_test.rb
index 568c85d89..a7cb2b2db 100644
--- a/test/vagrant/ssh_test.rb
+++ b/test/vagrant/ssh_test.rb
@@ -74,6 +74,13 @@ class SshTest < Test::Unit::TestCase
         assert !Vagrant::SSH.up?
       }
     end
+
+    should "return false if the connection is dropped" do
+      Net::SSH.expects(:start).raises(Net::SSH::Disconnect)
+      assert_nothing_raised {
+        assert !Vagrant::SSH.up?
+      }
+    end
   end
 
   context "getting the ssh port" do