From bf5a099fa62ad05594141873148fa29cd643e6a6 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan@imexsystems.ca>
Date: Fri, 30 Jan 2026 22:39:56 -0800
Subject: [PATCH] IO-3529 DMS Make Code

Signed-off-by: Allan Carr <allan@imexsystems.ca>
---
 .../dms-cdk-makes/dms-cdk-makes.component.jsx       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
index 4a73fb265..ac07d277d 100644
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -49,12 +49,15 @@ export function DmsCdkVehicles({ form, job }) {
         open={open}
         onCancel={() => setOpen(false)}
         onOk={() => {
-          form.setFieldsValue({
-            dms_make: selectedModel.makecode,
-            dms_model: selectedModel.modelcode
-          });
-          setOpen(false);
+          if (selectedModel) {
+            form.setFieldsValue({
+              dms_make: selectedModel.makecode,
+              dms_model: selectedModel.modelcode
+            });
+            setOpen(false);
+          }
         }}
+        okButtonProps={{ disabled: !selectedModel }}
       >
         {error && <AlertComponent title={error.message} type="error" />}
         <Table