diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a5a050..1a58dbe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,6 @@ jobs:
           - ubuntu-latest
         arch:
           - x64
-          - x86
     steps:
       - uses: actions/checkout@v1
       - uses: julia-actions/setup-julia@latest
diff --git a/Project.toml b/Project.toml
index db5638d..f0143b3 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "RemoteHPC"
 uuid = "c4f2a1c4-7655-40d8-82ee-c6ae0a8b7409"
 authors = ["louisponet <louisponet@gmail.com>"]
-version = "0.3.17"
+version = "0.3.18"
 
 [deps]
 BinaryTraits = "190e46ec-f771-4705-b939-984896f7be0e"
diff --git a/src/servers.jl b/src/servers.jl
index eadfa97..fffff4c 100644
--- a/src/servers.jl
+++ b/src/servers.jl
@@ -212,6 +212,7 @@ function local_server()
     return load(s)
 end
 
+# TODO use versions.json from main julia site
 function install_julia(s::Server)
     julia_tar = "julia-1.8.5-linux-x86_64.tar.gz"
     p = ProgressUnknown("Installing julia on Server $(s.name) ($(s.username)@$(s.domain))...", spinner=true)
@@ -386,8 +387,13 @@ function load_config(s::Server)
 end
 
 function Base.gethostname(username::AbstractString, domain::AbstractString)
-    return split(server_command(username, domain, "hostname").stdout)[1]
+    t = server_command(username, domain, "hostname")
+    if !isempty(t.stderr)
+        error(t.stderr)
+    end
+    return split(t.stdout)[1]
 end
+
 Base.gethostname(s::Server) = gethostname(s.username, s.domain)
 
 function depot_path(s::Server)
@@ -470,22 +476,30 @@ end
 Pulls `remote` from the server to `loc`.
 """
 function pull(server::Server, remote::String, loc::String)
+    if !ispath(server, remote)
+        error("No such file or directory $remote.")
+    end
     path = isdir(loc) ? joinpath(loc, splitpath(remote)[end]) : loc
     if islocal(server)
         cp(remote, path; force = true)
     else
-        out = Pipe()
-        err = Pipe()
-        # OpenSSH_jll.scp() do scp_exec
-            run(pipeline(`scp -r $(ssh_string(server) * ":" * remote) $path`; stdout = out,
-                         stderr = err))
-        # end
-        close(out.in)
-        close(err.in)
-        stderr = read(err, String)
-        if !isempty(stderr)
-            error("$stderr")
+        if filesize(server, remote) > 100e6 || isdir(server, remote)
+            out = Pipe()
+            err = Pipe()
+            # OpenSSH_jll.scp() do scp_exec
+                run(pipeline(`scp -r $(ssh_string(server) * ":" * remote) $path`; stdout = out,
+                             stderr = err))
+            # end
+            close(out.in)
+            close(err.in)
+            stderr = read(err, String)
+            if !isempty(stderr)
+                error("$stderr")
+            end
+        else
+            write(loc, read(server, remote))
         end
+            
     end
     return path
 end
diff --git a/src/utils.jl b/src/utils.jl
index 841b548..ae4d33e 100644
--- a/src/utils.jl
+++ b/src/utils.jl
@@ -36,7 +36,7 @@ macro timeout(seconds, expr, err_expr=:(nothing))
                 RemoteHPC.log_error(RemoteHPC.StallException(err__))
                 $err_expr
             else
-                rethrow(err__.task.exception)
+                rethrow(err__)
             end
         end
     end)