3 files changed, 9 insertions, 9 deletions
diff --git a/extension/react-app/src/components/Layout.tsx b/extension/react-app/src/components/Layout.tsx
index 93729783..a54c0ed4 100644
--- a/extension/react-app/src/components/Layout.tsx
+++ b/extension/react-app/src/components/Layout.tsx
@@ -184,8 +184,8 @@ const Layout = () => {
                 />
               )}
               <ModelSelect />
-              {defaultModel.class_name === "OpenAIFreeTrial" &&
-                defaultModel.api_key === "" &&
+              {defaultModel?.class_name === "OpenAIFreeTrial" &&
+                defaultModel?.api_key === "" &&
                 (location.pathname === "/settings" ||
                   parseInt(localStorage.getItem("ftc") || "0") >= 125) && (
                   <ProgressBar
diff --git a/extension/react-app/src/components/ModelSelect.tsx b/extension/react-app/src/components/ModelSelect.tsx
index 29d9250e..9dd3f489 100644
--- a/extension/react-app/src/components/ModelSelect.tsx
+++ b/extension/react-app/src/components/ModelSelect.tsx
@@ -144,14 +144,14 @@ const NewProviderDiv = styled.div`
 `;
 
 function modelSelectTitle(model: any): string {
-  if (model.title) return model.title;
-  if (model.model !== undefined && model.model.trim() !== "") {
-    if (model.class_name) {
-      return `${model.class_name} - ${model.model}`;
+  if (model?.title) return model?.title;
+  if (model?.model !== undefined && model?.model.trim() !== "") {
+    if (model?.class_name) {
+      return `${model?.class_name} - ${model?.model}`;
     }
-    return model.model;
+    return model?.model;
   }
-  return model.class_name;
+  return model?.class_name;
 }
 
 function ModelSelect(props: {}) {
diff --git a/extension/react-app/src/components/ModelSettings.tsx b/extension/react-app/src/components/ModelSettings.tsx
index ac5a344b..4b9d5e64 100644
--- a/extension/react-app/src/components/ModelSettings.tsx
+++ b/extension/react-app/src/components/ModelSettings.tsx
@@ -53,7 +53,7 @@ function ModelSettings(props: { llm: any | undefined; role: string }) {
     <Div dashed={typeof props.llm === undefined}>
       {props.llm ? (
         <>
-          <b>{props.role}</b>: <b> {props.llm.class_name || "gpt-4"}</b>
+          <b>{props.role}</b>: <b> {props.llm?.class_name || "gpt-4"}</b>
           <form>
             {typeof modelOptions.api_key !== undefined && (
               <>