diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index b81e87a..489ccc1 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -45,14 +45,13 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const validateData = () => {
     const newData = getValidatedFormData(data, fields);
     const hasErrors = isFormDataHasErrors(newData);
+    console.log("create hasErrors", hasErrors);
     setData(newData);
     return hasErrors ? null : objectMap(({ value }) => value, newData);
   };
 
-  async function saveCaseData() {
-    const dataValues = validateData();
-
-    if (dataValues === null) {
+  async function saveCaseData(dataValues) {
+    if (isBusy) {
       return;
     }
     setIsBusy(true);
@@ -90,10 +89,20 @@ const CreateModal = ({ setShowModal, caseData }) => {
     }
   };
 
-  const handleCreate = () => {
-    if (!isBusy) {
-      void saveCaseData();
+  const handleCreateCase = (e) => {
+    e.preventDefault();
+    const dataValues = validateData();
+
+    if (dataValues === null) {
+      return;
+    } else {
+      try {
+        saveCaseData(dataValues);
+      } catch (err) {
+        console.log(err);
+      }
     }
+
     navigate("/dashboard");
   };
 
@@ -528,7 +537,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
         <Button
           className="primary-button"
           disabled={isBusy}
-          onClick={handleCreate}
+          onClick={handleCreateCase}
           labelText="Save Case"
         />
       </Modal.Footer>