diff --git a/package.json b/package.json
index bc1d18c..c800150 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "ImEX RPS",
   "author": "ImEX Systems Inc. <support@thinkimex.com>",
   "description": "ImEX RPS",
-  "version": "1.6.0-alpha.8",
+  "version": "1.6.0-alpha.9",
   "main": "electron/main.js",
   "homepage": "./",
   "dependencies": {
diff --git a/src/components/molecules/job-group/job-group.molecule.jsx b/src/components/molecules/job-group/job-group.molecule.jsx
index 4e1fecb..c813bf5 100644
--- a/src/components/molecules/job-group/job-group.molecule.jsx
+++ b/src/components/molecules/job-group/job-group.molecule.jsx
@@ -74,7 +74,7 @@ export function JobGroupMolecule({ bodyshop, jobId, group, job }) {
     <Menu
       onClick={handleMenuClick}
       //disabled
-      items={[{ label: "Default", key: "Default", value: "Default" }]}
+      items={[{ label: "N/A", key: "Default", value: "Default" }]}
     ></Menu>
   );
 
@@ -98,7 +98,7 @@ export function JobGroupMolecule({ bodyshop, jobId, group, job }) {
           <GroupVerifySwitch job={job} loading={loading} loadingCallback={setLoading} />
         </div>
       )}
-      {bodyshop.ins_rule_set === "MPI" && <JobsGroupModalMolecule job={job} />}
+      {bodyshop?.ins_rule_set === "MPI" && <JobsGroupModalMolecule job={job} />}
 
       {loading && <LoadingOutlined />}
     </Space>
diff --git a/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx b/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx
index 8e76528..98bfbad 100644
--- a/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx
+++ b/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx
@@ -139,7 +139,7 @@ export function JobsDetailDescriptionMolecule({ bodyshop, loading, job, jobDetai
         <Descriptions.Item label="Mileage">
           <Space size="small">
             {job.v_mileage}
-            {bodyshop.ins_rule_set === "MPI" && MPIRulesetToApply === "V3" && job.v_mileage < 20000 && (
+            {bodyshop?.ins_rule_set === "MPI" && MPIRulesetToApply === "V3" && job.v_mileage < 20000 && (
               <Tooltip title="Vehicle is under 20,000 KMs. No expected savings.">
                 <WarningOutlined style={{ color: "seagreen" }} />
               </Tooltip>
diff --git a/src/components/pages/routes/routes.page.jsx b/src/components/pages/routes/routes.page.jsx
index cd1f588..db8ec22 100644
--- a/src/components/pages/routes/routes.page.jsx
+++ b/src/components/pages/routes/routes.page.jsx
@@ -39,7 +39,7 @@ export function RoutesPage({ bodyshop, darkMode }) {
           <NotificationModalOrganism />
           {bodyshop?.ins_rule_set === "SGI" && (
             <Alert
-              message="SGI has not yet released savings targets or eligibility rules. Targets will be displayed as $0. MPI eligibility rules have been applied and may be incorrect."
+              message="SGI has not yet released eligibility rules. MPI eligibility rules have been applied and may be incorrect."
               type="warning"
               showIcon
               style={{ marginBottom: "1rem" }}
diff --git a/src/ipc/ipc-estimate-utils.js b/src/ipc/ipc-estimate-utils.js
index c25d0cb..50c383f 100644
--- a/src/ipc/ipc-estimate-utils.js
+++ b/src/ipc/ipc-estimate-utils.js
@@ -304,7 +304,7 @@ const DetermineVehicleGroup = async (job) => {
     job.v_type ? job.v_type.toUpperCase() : null
   );
   //Need to add a ruleset check here. If using V3, then we need to check against a different table.
-  const ins_rule_set = store.getState().user.bodyshop.ins_rule_set;
+  const ins_rule_set = store.getState().user?.bodyshop?.ins_rule_set;
 
   switch (ins_rule_set) {
     case "SGI":
diff --git a/src/util/GetJobTarget.js b/src/util/GetJobTarget.js
index 76bd8bf..9d97552 100644
--- a/src/util/GetJobTarget.js
+++ b/src/util/GetJobTarget.js
@@ -3,7 +3,7 @@ import { store } from "../redux/store";
 import { WhichMPIRulesetToApply } from "./constants";
 
 export default function GetJobTarget({ group, v_age, targets, close_date, v_mileage, job }) {
-  const ins_rule_set = store.getState().user.bodyshop.ins_rule_set;
+  const ins_rule_set = store.getState().user?.bodyshop?.ins_rule_set;
 
   switch (ins_rule_set) {
     case "SGI":
diff --git a/src/util/decimalPrecision.js b/src/util/decimalPrecision.js
index f53047b..d94c55c 100644
--- a/src/util/decimalPrecision.js
+++ b/src/util/decimalPrecision.js
@@ -1,7 +1,7 @@
 import { store } from "../redux/store";
 
 export function getDecimalPrecision() {
-    const ins_rule_set = store.getState().user.bodyshop.ins_rule_set;
+    const ins_rule_set = store.getState().user.bodyshop?.ins_rule_set;
     return ins_rule_set === "SGI" ? 2 : 1;
 }