Merge branch 'develop' into matthew/preview_urls

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/util/caches/response_cache.py b/synapse/util/caches/response_cache.py

index be310ba320..36686b479e 100644
--- a/synapse/util/caches/response_cache.py
+++ b/synapse/util/caches/response_cache.py
@@ -35,7 +35,7 @@ class ResponseCache(object):
             return None
 
     def set(self, key, deferred):
-        result = ObservableDeferred(deferred)
+        result = ObservableDeferred(deferred, consumeErrors=True)
         self.pending_result_cache[key] = result
 
         def remove(r):