From 0f8591a5a8695aa176736c651a361c40cf228b6d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 29 Oct 2018 15:20:19 +0000
Subject: [PATCH] Avoid else clause on exception for clarity

---
 synapse/handlers/room.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 76811050a6..9ff4656717 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -331,13 +331,12 @@ class RoomCreationHandler(BaseHandler):
                 yield directory_handler.delete_association(
                     requester, alias, send_event=False,
                 )
+                removed_aliases.append(alias_str)
             except SynapseError as e:
                 logger.warning(
                     "Unable to remove alias %s from old room: %s",
                     alias, e,
                 )
-            else:
-                removed_aliases.append(alias_str)
 
         # if we didn't find any aliases, or couldn't remove anyway, we can skip the rest
         # of this.