diff --git a/.circleci/config.yml b/.circleci/config.yml
index 596d65894..fc5216ffc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,7 @@ orbs:
   #snyk: snyk/snyk@0.0.8
   #cypress: cypress-io/cypress@1.23.0
   aws-s3: circleci/aws-s3@4.0.0
+  aws-cli: circleci/aws-cli@4.0
   eb: circleci/aws-elastic-beanstalk@2.0.1
 jobs:
   api-deploy:
@@ -71,6 +72,11 @@ jobs:
           command: npm i
 
       - run: npm run build
+      
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
 
       - aws-s3/sync:
           from: build
@@ -135,6 +141,11 @@ jobs:
 
       - run: npm run sentry:sourcemaps
 
+      - aws-cli/setup:
+          aws_access_key_id: AWS_ACCESS_KEY_ID
+          aws_secret_access_key: AWS_SECRET_ACCESS_KEY
+          region: AWS_REGION
+
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-test-beta/"
diff --git a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
index dcd6fd941..c2e2091d1 100644
--- a/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
+++ b/client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
@@ -23,9 +23,9 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
     );
   }, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
 
-  const calcRepairDays =
+  const calcRepairDays = job?.joblines?.length ?
     job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0) /
-    (bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime);
+    (bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime) : [];
 
   return (
     <div>
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index e396982d8..cd7b81456 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -879,7 +879,7 @@ export function JobsDetailHeaderActions({
             },
         ];
 
-        if (job.csiinvites.length) {
+        if (job?.csiinvites?.length) {
             children.push(
                 {
                     type: "divider"
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 7c58eda52..cbcb91807 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -121,7 +121,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               {job.alt_transport}
               <JobAltTransportChange job={job} />
             </DataLabel>
-            {job.cccontracts.length > 0 && (
+            {job?.cccontracts?.length > 0 && (
               <DataLabel label={t("jobs.labels.contracts")}>
                 {job.cccontracts.map((c) => (
                   <Link