diff --git a/python/ray/autoscaler/updater.py b/python/ray/autoscaler/updater.py
index 12397ebeb..e1547cf6f 100644
--- a/python/ray/autoscaler/updater.py
+++ b/python/ray/autoscaler/updater.py
@@ -293,7 +293,7 @@ class SSHCommandRunner(object):
             stdout=redirect,
             stderr=redirect)
 
-    def rsync_down(self, source, target, redirect=None):
+    def run_rsync_down(self, source, target, redirect=None):
         self.set_ssh_ip_if_required()
         self.process_runner.check_call(
             [
diff --git a/python/ray/exceptions.py b/python/ray/exceptions.py
index 92897a3e7..3e6ea37f1 100644
--- a/python/ray/exceptions.py
+++ b/python/ray/exceptions.py
@@ -61,6 +61,9 @@ class RayTaskError(RayError):
         if issubclass(RayTaskError, self.cause_cls):
             return self  # already satisfied
 
+        if issubclass(self.cause_cls, RayError):
+            return self  # don't try to wrap ray internal errors
+
         class cls(RayTaskError, self.cause_cls):
             def __init__(self, function_name, traceback_str, cause_cls,
                          proctitle, pid, ip):