diff --git a/app/modules_app/payments/bot_webhook.php b/app/modules_app/payments/bot_webhook.php
index bfd7b5c..d5a9f84 100644
--- a/app/modules_app/payments/bot_webhook.php
+++ b/app/modules_app/payments/bot_webhook.php
@@ -92,7 +92,7 @@ try {
     $db->commit();
     json_success(['status' => 'received'], $message);
 
-} catch (\Exception $e) {
+} catch (\Throwable $e) {
     if ($db->inTransaction()) $db->rollBack();
     error_log("Bot Webhook Error: " . $e->getMessage());
     json_error('حدث خطأ أثناء معالجة رسالة البوت.', 500);
diff --git a/app/modules_app/payments/create.php b/app/modules_app/payments/create.php
index ea0bc73..a76d854 100644
--- a/app/modules_app/payments/create.php
+++ b/app/modules_app/payments/create.php
@@ -66,7 +66,7 @@ try {
     $user = $stmt->fetch();
 
     // 6. Create payment request
-    $paymentId = generate_uuid();
+    $paymentId = Database::generateUuid();
     $stmt = $db->prepare("
         INSERT INTO payment_requests (id, tenant_id, user_id, plan_id, amount_jod, internal_reference, cliq_alias, payer_name, status, created_at)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'pending', NOW())
@@ -101,7 +101,7 @@ try {
         'instructions'     => "قم بالتحويل عبر CliQ إلى الاسم المستعار: {$cliqAlias} بمبلغ {$plan['price_jod']} دينار أردني.",
     ], 'تم إنشاء طلب الدفع بنجاح');
 
-} catch (\Exception $e) {
+} catch (\Throwable $e) {
     error_log("Payment Create Error: " . $e->getMessage());
     json_error('حدث خطأ أثناء إنشاء طلب الدفع.', 500);
 }
diff --git a/app/modules_app/payments/verify_reference.php b/app/modules_app/payments/verify_reference.php
index 10be652..8be7898 100644
--- a/app/modules_app/payments/verify_reference.php
+++ b/app/modules_app/payments/verify_reference.php
@@ -97,7 +97,7 @@ try {
         ], 'تم حفظ المرجع (بانتظار التأكيد)');
     }
 
-} catch (\Exception $e) {
+} catch (\Throwable $e) {
     if ($db->inTransaction()) $db->rollBack();
     error_log("Verify Reference Error: " . $e->getMessage());
     json_error('حدث خطأ أثناء معالجة رقم المرجع.', 500);