diff --git a/frontend/src/components/Displays/ConfirmScheduleDialogs/LocalizationVerification/ScheduleMissionWithLocalizationVerification.tsx b/frontend/src/components/Displays/ConfirmScheduleDialogs/LocalizationVerification/ScheduleMissionWithLocalizationVerification.tsx
index 4a486650..859160be 100644
--- a/frontend/src/components/Displays/ConfirmScheduleDialogs/LocalizationVerification/ScheduleMissionWithLocalizationVerification.tsx
+++ b/frontend/src/components/Displays/ConfirmScheduleDialogs/LocalizationVerification/ScheduleMissionWithLocalizationVerification.tsx
@@ -93,10 +93,10 @@ export const ScheduleMissionWithLocalizationVerificationDialog = ({
             {dialogToOpen === DialogTypes.conflictingMissionDecks && (
                 <ConflictingMissionDecksDialog closeDialog={closeDialog} missionDeckNames={unikMissionDeckNames!} />
             )}
-            {dialogToOpen === DialogTypes.conflictingRobotDeck && (
+            {dialogToOpen === DialogTypes.conflictingRobotDeck && selectedRobot?.currentInspectionArea?.deckName && (
                 <ConflictingRobotDeckDialog
                     closeDialog={closeDialog}
-                    robotDeckName={selectedRobot?.currentInspectionArea?.deckName!}
+                    robotDeckName={selectedRobot?.currentInspectionArea?.deckName}
                     desiredDeckName={unikMissionDeckNames![0]}
                 />
             )}
diff --git a/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx b/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx
index b1724d88..624eed53 100644
--- a/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx
+++ b/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx
@@ -80,29 +80,33 @@ export const MissionMapView = ({ mission }: MissionProps) => {
     displayedMapName = displayedMapName ? displayedMapName.charAt(0).toUpperCase() + displayedMapName.slice(1) : ' '
 
     useEffect(() => {
-        BackendAPICaller.getMap(mission.installationCode!, mission.map?.mapName!)
-            .then((imageBlob) => {
-                imageObjectURL.current = URL.createObjectURL(imageBlob)
-            })
-            .catch(() => {
-                imageObjectURL.current = NoMap
-            })
-            .then(() => {
-                getMeta(imageObjectURL.current).then((img) => {
-                    const mapCanvas = document.getElementById('mapCanvas') as HTMLCanvasElement
-                    if (mapCanvas) {
-                        mapCanvas.width = img.width
-                        mapCanvas.height = img.height
-                        const context = mapCanvas?.getContext('2d')
-                        if (context) {
-                            setMapContext(context)
-                            context.drawImage(img, 0, 0)
+        if (mission.map?.mapName) {
+            BackendAPICaller.getMap(mission.installationCode!, mission.map?.mapName)
+                .then((imageBlob) => {
+                    imageObjectURL.current = URL.createObjectURL(imageBlob)
+                })
+                .catch(() => {
+                    imageObjectURL.current = NoMap
+                })
+                .then(() => {
+                    getMeta(imageObjectURL.current).then((img) => {
+                        const mapCanvas = document.getElementById('mapCanvas') as HTMLCanvasElement
+                        if (mapCanvas) {
+                            mapCanvas.width = img.width
+                            mapCanvas.height = img.height
+                            const context = mapCanvas?.getContext('2d')
+                            if (context) {
+                                setMapContext(context)
+                                context.drawImage(img, 0, 0)
+                            }
+                            setMapCanvas(mapCanvas)
                         }
-                        setMapCanvas(mapCanvas)
-                    }
-                    setMapImage(img)
+                        setMapImage(img)
+                    })
                 })
-            })
+        } else {
+            imageObjectURL.current = NoMap
+        }
     }, [mission.installationCode, mission.id, mission.map?.mapName])
 
     useEffect(() => {