return old exception if remote_exception fails

mrocklin · Dec 29, 2015 · c2002b8 · c2002b8
1 parent 09a75c1
commit c2002b8
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/dask/async.py b/dask/async.py
@@ -580,9 +580,13 @@ def remote_exception(exc, tb):
     """ Metaclass that wraps exception type in RemoteException """
     if type(exc) in exceptions:
         typ = exceptions[type(exc)]
+        return typ(exc, tb)
     else:
-        typ = type(exc.__class__.__name__,
-                   (RemoteException, type(exc)),
-                   {'exception_type': type(exc)})
-        exceptions[type(exc)] = typ
-    return typ(exc, tb)
+        try:
+            typ = type(exc.__class__.__name__,
+                       (RemoteException, type(exc)),
+                       {'exception_type': type(exc)})
+            exceptions[type(exc)] = typ
+            return typ(exc, tb)
+        except TypeError:
+            return exc