diff --git a/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx b/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx
index 050cb9349..1678c5e5f 100644
--- a/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx
+++ b/frontend/src/components/Pages/InspectionPage/InspectionTable.tsx
@@ -193,7 +193,7 @@ const InspectionRow = ({
                 </Typography>
             </Table.Cell>
             <Table.Cell>{mission.comment}</Table.Cell>
-            <Table.Cell>{mission.area.areaName}</Table.Cell>
+            <Table.Cell>{mission.area ? mission.area.areaName : '-'}</Table.Cell>
             <Table.Cell>{lastCompleted}</Table.Cell>
             <Table.Cell>{inspection.deadline ? formatDateString(inspection.deadline.toISOString()) : ''}</Table.Cell>
             <Table.Cell>
diff --git a/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx b/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx
index d45faef99..95e353010 100644
--- a/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx
+++ b/frontend/src/components/Pages/MissionDefinitionPage/MissionDefinitionPage.tsx
@@ -79,8 +79,8 @@ function MissionDefinitionPageBody({ missionDefinition, updateMissionDefinition
     const { TranslateText } = useLanguageContext()
     let navigate = useNavigate()
 
-    const displayInspectionFrequency = (inspectionFrequency: string) => {
-        if (inspectionFrequency === null) return TranslateText('No inspection frequency set')
+    const displayInspectionFrequency = (inspectionFrequency: string | undefined) => {
+        if (inspectionFrequency === undefined) return TranslateText('No inspection frequency set')
         const timeArray = inspectionFrequency.split(':')
         const days: number = +timeArray[0]
         const hours: number = +timeArray[1]
@@ -101,10 +101,22 @@ function MissionDefinitionPageBody({ missionDefinition, updateMissionDefinition
                 left={TranslateText('Inspection frequency')}
                 right={displayInspectionFrequency(missionDefinition.inspectionFrequency)}
             />
-            <KeyValuePairDisplay left={TranslateText('Area')} right={missionDefinition.area.areaName} />
-            <KeyValuePairDisplay left={TranslateText('Deck')} right={missionDefinition.area.deckName} />
-            <KeyValuePairDisplay left={TranslateText('Plant')} right={missionDefinition.area.plantCode} />
-            <KeyValuePairDisplay left={TranslateText('Installation')} right={missionDefinition.area.installationCode} />
+            <KeyValuePairDisplay
+                left={TranslateText('Area')}
+                right={missionDefinition.area ? missionDefinition.area.areaName : '-'}
+            />
+            <KeyValuePairDisplay
+                left={TranslateText('Deck')}
+                right={missionDefinition.area ? missionDefinition.area.deckName : '-'}
+            />
+            <KeyValuePairDisplay
+                left={TranslateText('Plant')}
+                right={missionDefinition.area ? missionDefinition.area.plantCode : '-'}
+            />
+            <KeyValuePairDisplay
+                left={TranslateText('Installation')}
+                right={missionDefinition.area ? missionDefinition.area.installationCode : '-'}
+            />
             <KeyValuePairDisplay
                 left={TranslateText('Mission source')}
                 right={TranslateText(missionDefinition.sourceType)}
diff --git a/frontend/src/models/MissionDefinition.ts b/frontend/src/models/MissionDefinition.ts
index 7b17ea738..582ab28b5 100644
--- a/frontend/src/models/MissionDefinition.ts
+++ b/frontend/src/models/MissionDefinition.ts
@@ -11,10 +11,10 @@ export interface CondensedMissionDefinition {
     id: string
     name: string
     installationCode: string
-    comment: string
-    inspectionFrequency: string
+    comment?: string
+    inspectionFrequency: string | undefined
     lastRun: Mission
-    area: Area
+    area?: Area
     isDeprecated: boolean
     sourceType: string
 }
@@ -24,10 +24,10 @@ export interface MissionDefinition {
     tasks: Task[]
     name: string
     installationCode: string
-    comment: string
-    inspectionFrequency: string
+    comment?: string
+    inspectionFrequency: string | undefined
     lastRun: Mission
-    area: Area
+    area?: Area
     isDeprecated: boolean
     sourceType: string
 }
diff --git a/frontend/src/utils/StringFormatting.tsx b/frontend/src/utils/StringFormatting.tsx
index 0cd146ee8..2e3969936 100644
--- a/frontend/src/utils/StringFormatting.tsx
+++ b/frontend/src/utils/StringFormatting.tsx
@@ -3,7 +3,7 @@ export const formatBackendDateTimeToDate = (date: Date) => {
 }
 
 export const getInspectionDeadline = (
-    inspectionFrequency: string | null,
+    inspectionFrequency: string | undefined,
     lastRunTime: Date | null
 ): Date | undefined => {
     if (!inspectionFrequency || !lastRunTime) return undefined