Merge and robustify (??) iggy's commit.

diff --cc elpher.el
index 609eef6,2d9bc21..62356e5
--- 1/elpher.el
--- 2/elpher.el
+++ b/elpher.el
@@@ -1473,7 -1473,7 +1473,7 @@@ having URLs begining with URL-PREFIX.
                        #'string-prefix-p)))
      (if entry
          (let ((cert-url-prefix (car entry))
-               (cert-name (cadr entry)))
 -              (cert-name (cdr entry)))
++              (cert-name (if (consp (cdr entry)) (cadr entry) (cdr entry))))
            (message "Using certificate \"%s\" specified in elpher-certificate-map with prefix \"%s\""
                     cert-name cert-url-prefix)
            (elpher-get-existing-certificate cert-name cert-url-prefix))