Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handling

Fix exception handling in fetching remote profiles

changelog.d/3997.bugfix

@@ -0,0 +1 @@
+Fix exception handling in fetching remote profiles

synapse/handlers/profile.py

@@ -142,9 +142,7 @@ class BaseProfileHandler(BaseHandler):
                 if e.code != 404:
                     logger.exception("Failed to get displayname")
                 raise
-            except Exception:
-                logger.exception("Failed to get displayname")
-            else:
+
             defer.returnValue(result["displayname"])
 
     @defer.inlineCallbacks
@@ -199,8 +197,6 @@ class BaseProfileHandler(BaseHandler):
                 if e.code != 404:
                     logger.exception("Failed to get avatar_url")
                 raise
-            except Exception:
-                logger.exception("Failed to get avatar_url")
 
             defer.returnValue(result["avatar_url"])