diff --git a/container/layer.bzl b/container/layer.bzl
index e1c45f6fc..38e978395 100644
--- a/container/layer.bzl
+++ b/container/layer.bzl
@@ -118,15 +118,14 @@ def build_layer(
         args.add("--enable_mtime_preservation=true")
 
     xz_path = toolchain_info.xz_path
+    xz_tools = []
+    xz_input_manifests = []
     if toolchain_info.xz_target:
         xz_path = toolchain_info.xz_target.files_to_run.executable.path
         xz_tools, _, xz_input_manifests = ctx.resolve_command(tools = [toolchain_info.xz_target])
     elif toolchain_info.xz_path == "":
-        fail("xz could not be found. Make sure it is in the path or set it " +
-             "explicitly in the docker_toolchain_configure")
-    else:
-        xz_tools = []
-        xz_input_manifests = []
+        print("WARNING: xz could not be found. Make sure it is in the path or set it " +
+              "explicitly in the docker_toolchain_configure")
     args.add(xz_path, format = "--xz_path=%s")
 
     # Windows layer.tar require two separate root directories instead of just 1
diff --git a/toolchains/docker/toolchain.bzl b/toolchains/docker/toolchain.bzl
index 7151d1a4e..d8cff2d77 100644
--- a/toolchains/docker/toolchain.bzl
+++ b/toolchains/docker/toolchain.bzl
@@ -112,6 +112,13 @@ def _toolchain_configure_impl(repository_ctx):
         xz_attr = "xz_path = \"%s\"," % repository_ctx.attr.xz_path
     elif repository_ctx.which("xz"):
         xz_attr = "xz_path = \"%s\"," % repository_ctx.which("xz")
+    print("GIB: xz_attr: {}".format(xz_attr))
+    print("GIB: PATH: {}".format(repository_ctx.os.environ))
+    repository_ctx.execute(["/bin/bash", "-cx", """ls -l /usr/local/bin/
+                            sw_vers
+                            xcrun --find xz
+                            find / -name xz 2>/dev/null
+                            """], quiet = False)
 
     gzip_attr = ""
     if repository_ctx.attr.gzip_target: