diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php
index 8b08e16..25fa38d 100644
--- a/app/Http/Controllers/AkaunController.php
+++ b/app/Http/Controllers/AkaunController.php
@@ -868,9 +868,8 @@ class AkaunController extends Controller
 
         $petibesi = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/laporanpetibesi/'. $request->kodcaw .'/'. $tebus_date)->json();
 
-        if(!$petibesi)
-        {
-            return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.');
+        if (($petibesi['error'] ?? null) === 'Tiada data pada tarikh tersebut') {
+            return redirect()->back()->with('peti_besi_error_message', 'Tiada data pada tarikh tersebut.');
         }
 
         if(isset($request->jenis))
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index bd8ac88..e0dff38 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -257,6 +257,15 @@
     <script>
         let response_status = {!! json_encode(\Session::get('response_status')) !!};
         let response_message = {!! json_encode(\Session::get('response_message')) !!};
+        let peti_besi_error_message = {!! json_encode(\Session::get('peti_besi_error_message')) !!};
+
+        if(peti_besi_error_message){
+                Swal.fire({
+                  title: "Tiada Data",
+                  text: peti_besi_error_message,
+                  icon: "warning"
+                });
+        }
 
         let successToastMessage = document.querySelector('#success-toast-message')
         let failToastMessage = document.querySelector('#fail-toast-message')