--- smtpmail.el~	2011-06-22 22:06:16.593125000 +0000
+++ smtpmail.el	2011-06-23 00:48:05.562125000 +0000
@@ -652,3 +652,3 @@
 	  ;; If we couldn't access the server at all, we give up.
-	  (unless (setq process (car result))
+	  (unless (setq process (or (car-safe result) result))
 	    (throw 'done "Unable to contact server"))
@@ -658,2 +658,3 @@
 
+	  (when (consp result)
 	  (let* ((greeting (plist-get (cdr result) :greeting))
@@ -664,2 +665,3 @@
 	      (throw 'done (format "Connection not allowed: %s" greeting))))
+	  )
 	  
@@ -670,3 +672,3 @@
 
-	    (let* ((capabilities (plist-get (cdr result) :capabilities))
+	    (let* ((capabilities (plist-get (cdr-safe result) :capabilities))
 		   (code (smtpmail-response-code capabilities)))