diff --git a/templates/add_workspace_client_to_context.json.j2 b/templates/add_workspace_client_to_context.json.j2
index 17b7aef..e868312 100644
--- a/templates/add_workspace_client_to_context.json.j2
+++ b/templates/add_workspace_client_to_context.json.j2
@@ -101,8 +101,8 @@
 						"taskReferenceName": "extract_context",
 						"type": "LAMBDA",
 						"inputParameters": {
-							"client" : "${lookup_context.output.body}",
-							"scriptExpression": "function e(v){ return (v.length === 0)}; if(e($.client)) throw('Workspace client not found'); else return { client : $.client[0], id : $.client[0].id}"
+							"client" : "${lookup_context.output.body[0]}",
+							"scriptExpression": "function e(v){ return (v == null || v == undefined)}; if(e($.client)) throw('Workspace client not found'); else return { client : $.client, id : $.client.id}"
 						}
 					},
 					{