diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 9923b3fc0dc5d05709d04577ee1e7578509802eb..70c9a6f46bbf4a5d78b9959957d400a808921a9b 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -270,7 +270,7 @@ class FederationClient(FederationBase):
                 break
             except CodeMessageException:
                 raise
-            except RuntimeError as e:
+            except Exception as e:
                 logger.warn(
                     "Failed to make_join via %s: %s",
                     destination, e.message
@@ -319,7 +319,7 @@ class FederationClient(FederationBase):
                 })
             except CodeMessageException:
                 raise
-            except RuntimeError as e:
+            except Exception as e:
                 logger.warn(
                     "Failed to send_join via %s: %s",
                     destination, e.message