diff --git a/contrib/fromupstream.py b/contrib/fromupstream.py
index cab538a..a029ab7 100755
--- a/contrib/fromupstream.py
+++ b/contrib/fromupstream.py
@@ -15,6 +15,7 @@
 import pprint
 import re
 import signal
+import ssl
 import subprocess
 import sys
 import textwrap
@@ -257,7 +258,11 @@
     url = None
     for url in PATCHWORK_URLS:
         rpc = xmlrpc.client.ServerProxy(url + '/xmlrpc/')
-        res = rpc.patch_list({'msgid': msgid})
+        try:
+            res = rpc.patch_list({'msgid': msgid})
+        except ssl.SSLCertVerificationError:
+            errprint('Error: server "%s" gave an SSL error, skipping' % url)
+            continue
         if res:
             patch_id = res[0]['id']
             break