diff --git a/salesforce/lib/salesforce_api.rb b/salesforce/lib/salesforce_api.rb
index b8d1ff2..f7b84d5 100644
--- a/salesforce/lib/salesforce_api.rb
+++ b/salesforce/lib/salesforce_api.rb
@@ -29,6 +29,11 @@ module SalesforceAPI
         result = driver.login(:username => username, :password => password).result
       rescue SOAP::FaultError => e
         return nil
+      rescue SocketError => e
+        puts e.message
+        return nil
+      rescue Errno::ECONNRESET => e
+        return nil
       end
       driver.endpoint_url = result.serverUrl
       driver.headerhandler << HeaderHandler.new("SessionHeader", "sessionId" => result.sessionId)