diff --git a/src/pages/MeasureSave.tsx b/src/pages/MeasureSave.tsx
index a6b2429..5221966 100644
--- a/src/pages/MeasureSave.tsx
+++ b/src/pages/MeasureSave.tsx
@@ -120,14 +120,14 @@ export default function MeasureSave() {
       tljCode: tlj,
       gwdCode: gwd,
       xmCode: xm,
-      xbCode: XB_CODES.find((x) => x.value === directionCode[0])!.label,
+      xbCode: XB_CODES.find((x) => x.value === directionCode[0])?.label,
       stationCode:
         stationCode.length > 0
-          ? contextState.stationList.find((s) => s.value === stationCode[0])!.label
+          ? contextState.stationList.find((s) => s.value === stationCode[0])?.label
           : '',
-      lineClassify: LINE_CLASSIFY.find((l) => l.value === lineClassCode[0])!.label,
-      dataSource: DATA_SOURCE.find((d) => d.value === dataSourceCode[0])!.label,
-      unitType: UNIT_TYPES.find((u) => u.value === unitType[0])!.label,
+      lineClassify: LINE_CLASSIFY.find((l) => l.value === lineClassCode[0])?.label,
+      dataSource: DATA_SOURCE.find((d) => d.value === dataSourceCode[0])?.label,
+      unitType: UNIT_TYPES.find((u) => u.value === unitType[0])?.label,
       mile: +mile,
       meter: +meter,
     };
diff --git a/src/services/apiTypes.ts b/src/services/apiTypes.ts
index 615a78b..a51f2bb 100644
--- a/src/services/apiTypes.ts
+++ b/src/services/apiTypes.ts
@@ -62,17 +62,17 @@ export type MeasurementDTO = {
 };
 
 export type ExtraDesc = {
-  railSize: string;
-  tljCode: string;
-  gwdCode: string;
-  xmCode: string;
-  xbCode: string;
-  stationCode: string;
-  lineClassify: string;
-  dataSource: string;
-  unitType: string;
-  mile: number;
-  meter: number;
+  railSize?: string;
+  tljCode?: string;
+  gwdCode?: string;
+  xmCode?: string;
+  xbCode?: string;
+  stationCode?: string;
+  lineClassify?: string;
+  dataSource?: string;
+  unitType?: string;
+  mile?: number;
+  meter?: number;
 };
 
 export type StationItem = { key: string; value: string };