diff --git a/synapse/rest/media/v1/media_storage.py b/synapse/rest/media/v1/media_storage.py
index b6e7a19e1..001e84578 100644
--- a/synapse/rest/media/v1/media_storage.py
+++ b/synapse/rest/media/v1/media_storage.py
@@ -24,6 +24,7 @@ import contextlib
 import os
 import logging
 import shutil
+import sys
 
 logger = logging.getLogger(__name__)
 
@@ -114,12 +115,13 @@ class MediaStorage(object):
         try:
             with open(fname, "wb") as f:
                 yield f, fname, finish
-        except Exception as e:
+        except Exception:
+            t, v, tb = sys.exc_info()
             try:
                 os.remove(fname)
             except Exception:
                 pass
-            raise e
+            raise t, v, tb
 
         if not finished_called:
             raise Exception("Finished callback not called")