diff --git a/skyvern/forge/app.py b/skyvern/forge/app.py
index b3037577..82ba0a32 100644
--- a/skyvern/forge/app.py
+++ b/skyvern/forge/app.py
@@ -59,20 +59,14 @@ if SettingsManager.get_settings().ENABLE_VOLCENGINE:
 SECONDARY_LLM_API_HANDLER = LLMAPIHandlerFactory.get_llm_api_handler(
     SETTINGS_MANAGER.SECONDARY_LLM_KEY if SETTINGS_MANAGER.SECONDARY_LLM_KEY else SETTINGS_MANAGER.LLM_KEY
 )
-SELECT_AGENT_LLM_API_HANDLER = (
-    LLMAPIHandlerFactory.get_llm_api_handler(SETTINGS_MANAGER.SELECT_AGENT_LLM_KEY)
-    if SETTINGS_MANAGER.SELECT_AGENT_LLM_KEY
-    else SECONDARY_LLM_API_HANDLER
+SELECT_AGENT_LLM_API_HANDLER = LLMAPIHandlerFactory.get_llm_api_handler(
+    SETTINGS_MANAGER.SELECT_AGENT_LLM_KEY or SETTINGS_MANAGER.SECONDARY_LLM_KEY or SETTINGS_MANAGER.LLM_KEY
 )
-SINGLE_CLICK_AGENT_LLM_API_HANDLER = (
-    LLMAPIHandlerFactory.get_llm_api_handler(SETTINGS_MANAGER.SINGLE_CLICK_AGENT_LLM_KEY)
-    if SETTINGS_MANAGER.SINGLE_CLICK_AGENT_LLM_KEY
-    else SECONDARY_LLM_API_HANDLER
+SINGLE_CLICK_AGENT_LLM_API_HANDLER = LLMAPIHandlerFactory.get_llm_api_handler(
+    SETTINGS_MANAGER.SINGLE_CLICK_AGENT_LLM_KEY or SETTINGS_MANAGER.SECONDARY_LLM_KEY or SETTINGS_MANAGER.LLM_KEY
 )
-SINGLE_INPUT_AGENT_LLM_API_HANDLER = (
-    LLMAPIHandlerFactory.get_llm_api_handler(SETTINGS_MANAGER.SINGLE_INPUT_AGENT_LLM_KEY)
-    if SETTINGS_MANAGER.SINGLE_INPUT_AGENT_LLM_KEY
-    else SECONDARY_LLM_API_HANDLER
+SINGLE_INPUT_AGENT_LLM_API_HANDLER = LLMAPIHandlerFactory.get_llm_api_handler(
+    SETTINGS_MANAGER.SINGLE_INPUT_AGENT_LLM_KEY or SETTINGS_MANAGER.SECONDARY_LLM_KEY or SETTINGS_MANAGER.LLM_KEY
 )
 EXTRACTION_LLM_API_HANDLER = (
     LLMAPIHandlerFactory.get_llm_api_handler(SETTINGS_MANAGER.EXTRACTION_LLM_KEY)
diff --git a/skyvern/services/script_service.py b/skyvern/services/script_service.py
index 03d138b6..bb2335b3 100644
--- a/skyvern/services/script_service.py
+++ b/skyvern/services/script_service.py
@@ -946,6 +946,7 @@ async def generate_text(
             new_text = json_response.get("answer", new_text)
         except Exception:
             LOG.exception("Failed to generate text for script")
+            raise
     return new_text