diff --git a/lava_helper/lava_create_jobs.py b/lava_helper/lava_create_jobs.py
index a22f7c9..9c5e055 100755
--- a/lava_helper/lava_create_jobs.py
+++ b/lava_helper/lava_create_jobs.py
@@ -124,9 +124,9 @@
                         params = {
                             "device_type": config["device_type"],
                             "job_timeout": config["job_timeout"],
-                            "action_timeout": config["action_timeout"],
-                            "monitor_timeout": config["monitor_timeout"],
-                            "poweroff_timeout": config["poweroff_timeout"],
+                            "action_timeout": config.get("action_timeout", ''),
+                            "monitor_timeout": config.get("monitor_timeout", ''),
+                            "poweroff_timeout": config.get("poweroff_timeout", ''),
                             "compiler": compiler,
                             "build_type": build_type,
                             "build_no": build_no,
@@ -147,12 +147,16 @@
                                 "firmware_url": get_artifact_url(
                                     artifact_store_url,
                                     params,
-                                    test_dict["binaries"]["firmware"],
+                                    test_dict.get("binaries").get("firmware"),
                                 ),
+                            }
+                        )
+                        params.update(
+                            {
                                 "bootloader_url": get_artifact_url(
                                     artifact_store_url,
                                     params,
-                                    test_dict["binaries"]["bootloader"],
+                                    test_dict.get("binaries").get("bootloader"),
                                 ),
                             }
                         )