diff --git a/benchmarks/main.ts b/benchmarks/main.ts
index cee6399699..424c01b038 100644
--- a/benchmarks/main.ts
+++ b/benchmarks/main.ts
@@ -270,17 +270,23 @@ await new Command()
         const elapsed = start ? Math.ceil((Date.now() - start) / 1000) : 0;
         const sum = jobsSent.reduce((a, b) => a + b, 0);
         let queue_length = -1;
-        try {
-          queue_length = (
-            await (
-              await fetch(
-                host + "/api/w/" + config.workspace_id + "/jobs/queue/count",
-                { headers: { ["Authorization"]: "Bearer " + config.token } }
-              )
-            ).json()
-          ).database_length;
-        } catch (e) {
-          console.error("Error reading queue count: " + e);
+        while (queue_length === -1) {
+          try {
+            queue_length = (
+              await (
+                await fetch(
+                  host + "/api/w/" + config.workspace_id + "/jobs/queue/count",
+                  { headers: { ["Authorization"]: "Bearer " + config.token } }
+                )
+              ).json()
+            ).database_length;
+          } catch (e) {
+            console.log(
+              `queue count not reachable. waiting...                                                           `
+            );
+            await sleep(0.5);
+            continue;
+          }
         }
         await Deno.stdout.write(
           enc(
diff --git a/benchmarks/worker.ts b/benchmarks/worker.ts
index 54d4890b54..6e85180dbe 100644
--- a/benchmarks/worker.ts
+++ b/benchmarks/worker.ts
@@ -1,9 +1,9 @@
 /// <reference no-default-lib="true" />
 /// <reference lib="deno.worker" />
 import { sleep } from "https://deno.land/x/sleep@v1.2.1/sleep.ts";
-import * as windmill from "https://deno.land/x/windmill@v1.121.0/mod.ts";
-import * as api from "https://deno.land/x/windmill@v1.121.0/windmill-api/index.ts";
-import { Job } from "https://deno.land/x/windmill@v1.121.0/windmill-api/index.ts";
+import * as windmill from "https://deno.land/x/windmill@v1.151.0/mod.ts";
+import * as api from "https://deno.land/x/windmill@v1.151.0/windmill-api/index.ts";
+import { Job } from "https://deno.land/x/windmill@v1.151.0/windmill-api/index.ts";
 import { Action, evaluate } from "./action.ts";
 
 const promise = new Promise<{
@@ -58,242 +58,229 @@ const updateStatusInterval = setInterval(() => {
 }, 100);
 
 while (cont) {
-  const queue_length = (
-    await (
-      await fetch(
-        config.server + "/api/w/" + config.workspace_id + "/jobs/queue/count",
-        { headers: { ["Authorization"]: "Bearer " + config.token } }
-      )
-    ).json()
-  ).database_length;
-  if (queue_length > 2500) {
+  try {
+    const queue_length = await getQueueCount();
+    if (queue_length > 2500) {
+      console.log(
+        `queue length: ${queue_length} > 2500. waiting...                                                            `
+      );
+      await sleep(0.5);
+      continue;
+    }
+
+    if (
+      (total_spawned * 1000) / (Date.now() - start_time) >
+      config.per_worker_throughput
+    ) {
+      console.log("at maximum throughput. waiting...");
+      await sleep(0.1);
+      continue;
+    }
+    total_spawned++;
+    if (total_spawned > config.max_per_worker) {
+      break;
+    }
+    let uuid: string;
+    if (config.custom) {
+      await evaluate(config.custom);
+      continue;
+    } else if (config.useFlows) {
+      let payload: api.FlowPreview;
+      if (config.flowPattern == "branchone") {
+        payload = {
+          path: "branchone",
+          args: {},
+          value: {
+            modules: [
+              {
+                id: "a",
+                value: {
+                  input_transforms: {},
+                  language: api.RawScript.language.DENO,
+                  type: "rawscript",
+                  content:
+                    'export function main(){ return Deno.env.get("WM_FLOW_JOB_ID"); }',
+                },
+              },
+              {
+                id: "b",
+                value: {
+                  type: "branchone",
+                  branches: [],
+                  default: [
+                    {
+                      id: "c",
+                      value: {
+                        input_transforms: {
+                          x: {
+                            type: "javascript",
+                            expr: "results.a",
+                          },
+                        },
+                        language: api.RawScript.language.DENO,
+                        type: "rawscript",
+                        content: "export function main(x: string){ return x; }",
+                      },
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        };
+      } else if (config.flowPattern == "branchallparrallel") {
+        payload = {
+          path: "branchall",
+          args: {},
+          value: {
+            modules: [
+              {
+                id: "a",
+                value: {
+                  input_transforms: {},
+                  language: api.RawScript.language.DENO,
+                  type: "rawscript",
+                  content:
+                    'export function main(){ return Deno.env.get("WM_FLOW_JOB_ID"); }',
+                },
+              },
+              {
+                id: "b",
+                value: {
+                  type: "branchall",
+                  parallel: true,
+                  branches: [
+                    {
+                      modules: [
+                        {
+                          id: "c",
+                          value: {
+                            input_transforms: {
+                              x: {
+                                type: "javascript",
+                                expr: "results.a",
+                              },
+                            },
+                            language: api.RawScript.language.DENO,
+                            type: "rawscript",
+                            content:
+                              "export function main(x: string){ return x; }",
+                          },
+                        },
+                      ],
+                    },
+                    {
+                      modules: [
+                        {
+                          id: "d",
+                          value: {
+                            input_transforms: {
+                              x: {
+                                type: "javascript",
+                                expr: "results.a",
+                              },
+                            },
+                            language: api.RawScript.language.DENO,
+                            type: "rawscript",
+                            content:
+                              "export function main(x: string){ return x; }",
+                          },
+                        },
+                      ],
+                    },
+                  ],
+                },
+              },
+            ],
+          },
+        };
+      } else {
+        payload = {
+          path: "2steps",
+          args: {},
+          value: {
+            modules: [
+              {
+                id: "a",
+                value: {
+                  input_transforms: {},
+                  language: api.RawScript.language.DENO,
+                  type: "rawscript",
+                  content:
+                    'export function main(){ return Deno.env.get("WM_JOB_ID"); }',
+                },
+              },
+              {
+                id: "b",
+                value: {
+                  input_transforms: {},
+                  language: api.RawScript.language.DENO,
+                  type: "rawscript",
+                  content:
+                    'export function main(){ return Deno.env.get("WM_JOB_ID"); }',
+                },
+              },
+            ],
+          },
+        };
+      }
+      uuid = await windmill.JobService.runFlowPreview({
+        workspace: config.workspace_id,
+        requestBody: payload,
+      });
+    } else {
+      let payload: api.Preview;
+      if (config.scriptPattern == "noop") {
+        payload = {
+          path: "noop",
+          kind: "noop",
+          args: {},
+        };
+      } else if (config.scriptPattern == "identity") {
+        payload = {
+          path: "identity",
+          kind: "identity",
+          args: {
+            identity: "itsme",
+          },
+        };
+      } else if (config.scriptPattern == "postgresql") {
+        payload = {
+          path: "postgresql",
+          language: "postgresql",
+          args: {
+            query: "SELECT email FROM usr",
+            database_url:
+              "postgres://postgres:changeme@localhost:5432/windmill",
+          },
+        };
+      } else {
+        payload = {
+          path: "denosimple",
+          language: api.Preview.language.DENO,
+          content:
+            'export function main(){ return Deno.env.get("WM_JOB_ID"); }',
+          args: {},
+        };
+      }
+      try {
+        uuid = await windmill.JobService.runScriptPreview({
+          workspace: config.workspace_id,
+          requestBody: payload,
+        });
+      } catch (e) {
+        console.error("error running script: " + e.body);
+        Deno.exit(1);
+      }
+    }
+    if (!config.continous) outstanding.push(uuid);
+  } catch (e) {
     console.log(
-      `queue length: ${queue_length} > 2500. waiting...                                                            `
+      `error while sending job: ${e}                                                          `
     );
     await sleep(0.5);
     continue;
   }
-
-  if (
-    (total_spawned * 1000) / (Date.now() - start_time) >
-    config.per_worker_throughput
-  ) {
-    console.log("at maximum throughput. waiting...");
-    await sleep(0.1);
-    continue;
-  }
-  total_spawned++;
-  if (total_spawned > config.max_per_worker) {
-    break;
-  }
-  let uuid: string;
-  if (config.custom) {
-    await evaluate(config.custom);
-    continue;
-  } else if (config.useFlows) {
-    let payload: api.FlowPreview;
-    if (config.flowPattern == "branchone") {
-      payload = {
-        path: "branchone",
-        args: {},
-        value: {
-          modules: [
-            {
-              id: "a",
-              value: {
-                input_transforms: {},
-                language: api.RawScript.language.DENO,
-                type: "rawscript",
-                content:
-                  'export function main(){ return Deno.env.get("WM_FLOW_JOB_ID"); }',
-              },
-            },
-            {
-              id: "b",
-              value: {
-                type: "branchone",
-                branches: [],
-                default: [
-                  {
-                    id: "c",
-                    value: {
-                      input_transforms: {
-                        x: {
-                          type: "javascript",
-                          expr: "results.a",
-                        },
-                      },
-                      language: api.RawScript.language.DENO,
-                      type: "rawscript",
-                      content: "export function main(x: string){ return x; }",
-                    },
-                  },
-                ],
-              },
-            },
-          ],
-        },
-      };
-    } else if (config.flowPattern == "branchallparrallel") {
-      payload = {
-        path: "branchall",
-        args: {},
-        value: {
-          modules: [
-            {
-              id: "a",
-              value: {
-                input_transforms: {},
-                language: api.RawScript.language.DENO,
-                type: "rawscript",
-                content:
-                  'export function main(){ return Deno.env.get("WM_FLOW_JOB_ID"); }',
-              },
-            },
-            {
-              id: "b",
-              value: {
-                type: "branchall",
-                parallel: true,
-                branches: [
-                  {
-                    modules: [
-                      {
-                        id: "c",
-                        value: {
-                          input_transforms: {
-                            x: {
-                              type: "javascript",
-                              expr: "results.a",
-                            },
-                          },
-                          language: api.RawScript.language.DENO,
-                          type: "rawscript",
-                          content:
-                            "export function main(x: string){ return x; }",
-                        },
-                      },
-                    ],
-                  },
-                  {
-                    modules: [
-                      {
-                        id: "d",
-                        value: {
-                          input_transforms: {
-                            x: {
-                              type: "javascript",
-                              expr: "results.a",
-                            },
-                          },
-                          language: api.RawScript.language.DENO,
-                          type: "rawscript",
-                          content:
-                            "export function main(x: string){ return x; }",
-                        },
-                      },
-                    ],
-                  },
-                ],
-              },
-            },
-          ],
-        },
-      };
-    } else {
-      payload = {
-        path: "2steps",
-        args: {},
-        value: {
-          modules: [
-            {
-              id: "a",
-              value: {
-                input_transforms: {},
-                language: api.RawScript.language.DENO,
-                type: "rawscript",
-                content:
-                  'export function main(){ return Deno.env.get("WM_JOB_ID"); }',
-              },
-            },
-            {
-              id: "b",
-              value: {
-                input_transforms: {},
-                language: api.RawScript.language.DENO,
-                type: "rawscript",
-                content:
-                  'export function main(){ return Deno.env.get("WM_JOB_ID"); }',
-              },
-            },
-          ],
-        },
-      };
-    }
-    uuid = await windmill.JobService.runFlowPreview({
-      workspace: config.workspace_id,
-      requestBody: payload,
-    });
-  } else {
-    let payload: api.Preview;
-    if (config.scriptPattern == "httpversion") {
-      payload = {
-        path: "httpversion",
-        kind: "http",
-        args: {
-          url: "http://localhost:8000/api/version",
-        },
-      };
-    } else if (config.scriptPattern == "httpslow") {
-      payload = {
-        path: "httpversion",
-        kind: "http",
-        args: {
-          url: "https://hub.dummyapis.com/delay?seconds=10",
-        },
-      };
-    } else if (config.scriptPattern == "noop") {
-      payload = {
-        path: "noop",
-        kind: "noop",
-        args: {},
-      };
-    } else if (config.scriptPattern == "identity") {
-      payload = {
-        path: "identity",
-        kind: "identity",
-        args: {
-          identity: "itsme",
-        },
-      };
-    } else if (config.scriptPattern == "postgresql") {
-      payload = {
-        path: "postgresql",
-        language: "postgresql",
-        args: {
-          query: "SELECT email FROM usr",
-          database_url: "postgres://postgres:changeme@localhost:5432/windmill",
-        },
-      };
-    } else {
-      payload = {
-        path: "denosimple",
-        language: api.Preview.language.DENO,
-        content: 'export function main(){ return Deno.env.get("WM_JOB_ID"); }',
-        args: {},
-      };
-    }
-    try {
-      uuid = await windmill.JobService.runScriptPreview({
-        workspace: config.workspace_id,
-        requestBody: payload,
-      });
-    } catch (e) {
-      console.error("error running script: " + e.body);
-      Deno.exit(1);
-    }
-  }
-  if (!config.continous) outstanding.push(uuid);
 }
 
 clearInterval(updateStatusInterval);
@@ -315,51 +302,56 @@ async function getQueueCount() {
 }
 
 while (outstanding.length > 0 && Date.now() < end_time) {
-  await Deno.stdout.write(
-    enc("\rwaiting for jobs to complete: " + outstanding.length + "\n")
-  );
-  const uuid = outstanding.shift()!;
-
-  let r: Job;
   try {
-    r = await windmill.JobService.getJob({
-      workspace: config.workspace_id,
-      id: uuid,
-    });
-  } catch (e) {
-    console.log("job not found: " + uuid + " " + e.message);
-    continue;
-  }
-  if (r.type == "QueuedJob") {
-    outstanding.push(uuid);
     await Deno.stdout.write(
-      enc(`uuid: ${uuid}, queue length: ${await getQueueCount()}\r`)
+      enc("\rwaiting for jobs to complete: " + outstanding.length + "\n")
     );
-  } else {
-    r = r as api.CompletedJob;
+    const uuid = outstanding.shift()!;
+
+    let r: Job;
     try {
-      if (
-        !["httpversion", "identity", "httpslow", "noop"].includes(
-          config.scriptPattern
-        ) &&
-        r.result != uuid
-      ) {
-        console.log(
-          "job did not return correct UUID: " +
-            r.result +
-            " != " +
-            uuid +
-            "job: \n" +
-            JSON.stringify(r, null, 2)
-        );
-        incorrect_results++;
-      } else {
-        // console.log(r.result);
-      }
+      r = await windmill.JobService.getJob({
+        workspace: config.workspace_id,
+        id: uuid,
+      });
     } catch (e) {
-      console.log("error during wait: ", e);
-      outstanding.push(uuid);
+      console.log("job not found: " + uuid + " " + e.message);
+      continue;
     }
+    if (r.type == "QueuedJob") {
+      outstanding.push(uuid);
+      await Deno.stdout.write(
+        enc(`uuid: ${uuid}, queue length: ${await getQueueCount()}\r`)
+      );
+    } else {
+      r = r as api.CompletedJob;
+      try {
+        if (
+          !["httpversion", "identity", "httpslow", "noop"].includes(
+            config.scriptPattern
+          ) &&
+          r.result != uuid
+        ) {
+          console.log(
+            "job did not return correct UUID: " +
+              r.result +
+              " != " +
+              uuid +
+              "job: \n" +
+              JSON.stringify(r, null, 2)
+          );
+          incorrect_results++;
+        } else {
+          // console.log(r.result);
+        }
+      } catch (e) {
+        console.log("error during wait: ", e);
+        outstanding.push(uuid);
+      }
+    }
+  } catch (e) {
+    console.log("error while waiting for outstanding jobs, sleeing: ", e);
+    await sleep(0.5);
   }
 }