diff --git a/versi/backend/api/jalan.php b/versi/backend/api/jalan.php
index 886efd9..181ab88 100644
--- a/versi/backend/api/jalan.php
+++ b/versi/backend/api/jalan.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * jalan.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Jalan (LineString).
diff --git a/versi/backend/api/kavling.php b/versi/backend/api/kavling.php
index 4d51ee2..046a287 100644
--- a/versi/backend/api/kavling.php
+++ b/versi/backend/api/kavling.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * kavling.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Kavling (Polygon).
diff --git a/versi/backend/api/rumah_ibadah.php b/versi/backend/api/rumah_ibadah.php
index b1172c4..a600338 100644
--- a/versi/backend/api/rumah_ibadah.php
+++ b/versi/backend/api/rumah_ibadah.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * rumah_ibadah.php
  * Tanggung Jawab: Operasi CRUD Rumah Ibadah + Endpoint analisis jangkauan Haversine.
diff --git a/versi/backend/api/spbu.php b/versi/backend/api/spbu.php
index 6acaf74..60a68ff 100644
--- a/versi/backend/api/spbu.php
+++ b/versi/backend/api/spbu.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
diff --git a/versi/backend/api/statistik.php b/versi/backend/api/statistik.php
index 0208fa0..d1ee2d6 100644
--- a/versi/backend/api/statistik.php
+++ b/versi/backend/api/statistik.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * statistik.php
  * Tanggung Jawab: Menyediakan data analisis spasial menggunakan Point in Polygon (ST_Contains).
diff --git a/versi/backend/api/warga_miskin.php b/versi/backend/api/warga_miskin.php
index 2c48a44..0abd799 100644
--- a/versi/backend/api/warga_miskin.php
+++ b/versi/backend/api/warga_miskin.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * warga_miskin.php
  * Tanggung Jawab: Operasi CRUD untuk Warga Miskin.
diff --git a/webgis_app/core_config/database.php b/webgis_app/core_config/database.php
index 7f099e1..9713dd4 100644
--- a/webgis_app/core_config/database.php
+++ b/webgis_app/core_config/database.php
@@ -32,24 +32,43 @@ class Database {
                 $password = self::env('DB_PASSWORD', '');
             }
 
-            self::$conn = new PDO(
-                "mysql:host={$host};port={$port};dbname={$dbName};charset=utf8mb4",
-                $username,
-                $password
-            );
-            self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-            self::$conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+            try {
+                self::$conn = new PDO(
+                    "mysql:host={$host};port={$port};dbname={$dbName};charset=utf8mb4",
+                    $username,
+                    $password
+                );
+                self::$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                self::$conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
 
-            // Disable strict mode for GROUP BY to prevent 1055 errors in Coolify's MariaDB
-            self::$conn->exec("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))");
+                // Disable strict mode for GROUP BY to prevent 1055 errors in Coolify's MariaDB
+                self::$conn->exec("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))");
 
-            // Auto-initialize database if empty
-            $stmt = self::$conn->query("SHOW TABLES LIKE 'users'");
-            if ($stmt->rowCount() == 0) {
-                $sqlFile = __DIR__ . '/../../db_scripts/webgis_naufal_zaky.sql';
-                if (file_exists($sqlFile)) {
-                    $sql = file_get_contents($sqlFile);
-                    self::$conn->exec($sql);
+                // Auto-initialize database if empty
+                $stmt = self::$conn->query("SHOW TABLES LIKE 'users'");
+                if ($stmt->rowCount() == 0) {
+                    $sqlFile = __DIR__ . '/../../db_scripts/webgis_naufal_zaky.sql';
+                    if (file_exists($sqlFile)) {
+                        $sql = file_get_contents($sqlFile);
+                        self::$conn->exec($sql);
+                    }
+                }
+            } catch (PDOException $e) {
+                $isApi = (defined('JSON_REQUEST') && JSON_REQUEST) ||
+                         (strpos($_SERVER['REQUEST_URI'] ?? '', '/api/') !== false) ||
+                         (strpos($_SERVER['REQUEST_URI'] ?? '', 'endpoints/') !== false) ||
+                         (isset($_SERVER['HTTP_ACCEPT']) && strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false);
+
+                if ($isApi) {
+                    header('Content-Type: application/json; charset=utf-8');
+                    http_response_code(500);
+                    echo json_encode([
+                        'status' => 'error',
+                        'message' => 'Database Connection Failed: ' . $e->getMessage()
+                    ]);
+                    exit();
+                } else {
+                    die("Database Connection Failed: " . $e->getMessage());
                 }
             }
         }
diff --git a/webgis_app/import.php b/webgis_app/import.php
index e8b5d60..53045c4 100644
--- a/webgis_app/import.php
+++ b/webgis_app/import.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once __DIR__ . '/core_config/settings.php';
 
 $host = getenv('DB_HOST') ?: 'localhost';
diff --git a/webgis_app/index.php b/webgis_app/index.php
index 09c45d2..a776d6d 100644
--- a/webgis_app/index.php
+++ b/webgis_app/index.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once __DIR__ . '/core_config/session_mgr.php';
 startAppSession();
 if (isset($_SESSION['user_id'])) {
diff --git a/webgis_app/logout.php b/webgis_app/logout.php
index 64e6652..f1e5327 100644
--- a/webgis_app/logout.php
+++ b/webgis_app/logout.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once __DIR__ . '/core_config/session_mgr.php';
 startAppSession();
 session_destroy();
diff --git a/webgis_app/panel_admin/kelola_jalan.php b/webgis_app/panel_admin/kelola_jalan.php
index 293b51a..e824093 100644
--- a/webgis_app/panel_admin/kelola_jalan.php
+++ b/webgis_app/panel_admin/kelola_jalan.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once __DIR__ . '/../core_config/database.php';
 require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
diff --git a/webgis_app/panel_admin/kelola_kavling.php b/webgis_app/panel_admin/kelola_kavling.php
index c6b0569..3cb7273 100644
--- a/webgis_app/panel_admin/kelola_kavling.php
+++ b/webgis_app/panel_admin/kelola_kavling.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once __DIR__ . '/../core_config/database.php';
 require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
diff --git a/webgis_app/panel_admin/kelola_kawasan.php b/webgis_app/panel_admin/kelola_kawasan.php
index cbcd9ae..d03d866 100644
--- a/webgis_app/panel_admin/kelola_kawasan.php
+++ b/webgis_app/panel_admin/kelola_kawasan.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once __DIR__ . '/../core_config/database.php';
 require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
diff --git a/webgis_app/panel_admin/manajemen_pengguna.php b/webgis_app/panel_admin/manajemen_pengguna.php
index 60378e3..1ec7a78 100644
--- a/webgis_app/panel_admin/manajemen_pengguna.php
+++ b/webgis_app/panel_admin/manajemen_pengguna.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 require_once __DIR__ . '/../core_config/database.php';
 require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');