diff --git a/Modules/Internal/Http/Controllers/Api/ClaimController.php b/Modules/Internal/Http/Controllers/Api/ClaimController.php
index 876c2d82..ce98c742 100644
--- a/Modules/Internal/Http/Controllers/Api/ClaimController.php
+++ b/Modules/Internal/Http/Controllers/Api/ClaimController.php
@@ -66,6 +66,11 @@ class ClaimController extends Controller
         // Store Claim
         if ($validation['isEligible']) {
             $claim = ClaimService::storeClaim($member, $diagnosis, $request->total_claim, $benefit);
+        } else {
+            return response()->json([
+                'data' => $validation,
+                'message' => $validation['errors'][0]['message']
+            ], 403);
         }
 
         return response()->json($claim);
diff --git a/frontend/dashboard/src/pages/Claims/Create.tsx b/frontend/dashboard/src/pages/Claims/Create.tsx
index efb6aa69..948fd347 100755
--- a/frontend/dashboard/src/pages/Claims/Create.tsx
+++ b/frontend/dashboard/src/pages/Claims/Create.tsx
@@ -64,8 +64,8 @@ export default function ClaimsCreate() {
         navigate('/claims');
       })
       .catch(function (err) {
-        console.log('ERROR CUK', err.data)
-        enqueueSnackbar('Failed Creating Claim', { variant: 'error' })
+        console.log('ERROR CUK', err)
+        enqueueSnackbar('Failed Creating Claim : '+ err.response.data.message, { variant: 'error' })
       })
   };
 
@@ -265,7 +265,7 @@ export default function ClaimsCreate() {
                       }}
                       renderInput={(params) => (
                         <TextField
-                          // name="benefit"
+                          name="benefit"
                           {...params}
                           label="Benefit"
                           variant="outlined"
@@ -296,7 +296,7 @@ export default function ClaimsCreate() {
                         onChange(newValue);
                       }}
                       renderInput={(params) => (
-                        <RHFTextField
+                        <TextField
                           name="diagnosis"
                           {...params}
                           label="Diagnosis"
@@ -387,9 +387,6 @@ export default function ClaimsCreate() {
 
                 <RHFTextField type="number" name="total_claim" label="Total Claim" />
                 
-                <LoadingButton onClick={handleSubmit(onSubmit)} variant="contained" color="success" style={{color: '#ffffff'}} size="large" fullWidth={true} loading={isCheckingLimit}>
-                    Create Claim
-                  </LoadingButton>
                 { isEligible === true ? (
                   <LoadingButton onClick={handleSubmit(onSubmit)} variant="contained" color="success" style={{color: '#ffffff'}} size="large" fullWidth={true} loading={isCheckingLimit}>
                     Create Claim