diff --git a/server/db.js b/server/db.js
index d8c82ad..a8e86e7 100644
--- a/server/db.js
+++ b/server/db.js
@@ -1,5 +1,11 @@
 const mysql = require('mysql2/promise');
 
+// Validate environment variables
+if (!process.env.DB_HOST || !process.env.DB_USER || !process.env.DB_PASS || !process.env.DB_NAME) {
+  console.error('Database configuration is missing in .env file.');
+  process.exit(1);
+}
+
 const pool = mysql.createPool({
   host: process.env.DB_HOST,
   user: process.env.DB_USER,
@@ -13,7 +19,12 @@ const pool = mysql.createPool({
 
 module.exports = {
   query: async (sql, params) => {
-    const [rows] = await pool.execute(sql, params);
-    return rows;
+    try {
+      const [rows] = await pool.execute(sql, params);
+      return rows;
+    } catch (error) {
+      console.error('Database query error:', error.message);
+      throw error;
+    }
   }
 };
\ No newline at end of file