diff --git a/holoviews/ipython/display_hooks.py b/holoviews/ipython/display_hooks.py
index 748f45a3d3..04aa3a5be8 100644
--- a/holoviews/ipython/display_hooks.py
+++ b/holoviews/ipython/display_hooks.py
@@ -136,9 +136,12 @@ def wrapped(element):
             return "<b>{name}</b>{msg}<br>{message}".format(msg=msg, **info)
 
         except Exception as e:
+            t, v, tb = sys.exc_info()
             try: option_state(element, state=optstate)
-            except: pass
-            raise
+            except Exception: pass
+            if sys.version_info[0] < 3:
+                raise (t, v, tb)
+            raise v.with_traceback(tb)
     return wrapped