diff --git a/index.js b/index.js
index eabc88e..25db9a3 100644
--- a/index.js
+++ b/index.js
@@ -154,7 +154,7 @@ client.on("interactionCreate", async (interaction) => {
 					}
 
 					if (discordId) {
-						discordUsername = (await client.users.fetch(discordId)).username || "Unknown"
+						discordUsername = (await client.users.fetch(discordId))?.username || "Unknown"
 					} else {
 						discordUsername = null
 					}
diff --git a/routes/api.js b/routes/api.js
index 2f2e465..e1fc4a8 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -27,10 +27,10 @@ router.get('/v1/bans', async (req, res) => {
             const rows = await connection.query('SELECT * FROM bans');
 			// Convert all timestamps into epoch
 			rows.forEach(row => {
-				row.expiresTimestamp = row.expiresTimestamp ? row.expiresTimestamp.getTime() : null
-				row.banTimestamp = row.banTimestamp ? row.banTimestamp.getTime() : null
+                row.expiresTimestamp = row.expiresTimestamp ? new Date(row.expiresTimestamp).getTime() : null
+                row.banTimestamp = row.banTimestamp ? new Date(row.banTimestamp).getTime() : null
+				row.currentServerTime = new Date().getTime();
 			});
-
             // Send the results as a JSON response
             res.json(rows);
         } finally {
@@ -56,8 +56,9 @@ router.get("/v1/ban/roblox/:uid", async (req, res) => {
             const rows = await connection.query('SELECT * FROM bans WHERE robloxId = ?', [req.params.uid]);
 			// Convert all timestamps into epoch
 			rows.forEach(row => {
-				row.expiresTimestamp = row.expiresTimestamp ? row.expiresTimestamp.getTime() : null
-				row.banTimestamp = row.banTimestamp ? row.banTimestamp.getTime() : null
+                row.expiresTimestamp = row.expiresTimestamp ? new Date(row.expiresTimestamp).getTime() : null
+                row.banTimestamp = row.banTimestamp ? new Date(row.banTimestamp).getTime() : null
+				row.currentServerTime = new Date().getTime();
 			});
             // Send the results as a JSON response
             res.json(rows);
@@ -84,9 +85,11 @@ router.get("/v1/ban/discord/:uid", async (req, res) => {
             const rows = await connection.query('SELECT * FROM bans WHERE discordId = ?', [req.params.uid]);
 			// Convert all timestamps into epoch
 			rows.forEach(row => {
-				row.expiresTimestamp = row.expiresTimestamp ? row.expiresTimestamp.getTime() : null
-				row.banTimestamp = row.banTimestamp ? row.banTimestamp.getTime() : null
+				row.expiresTimestamp = row.expiresTimestamp ? new Date(row.expiresTimestamp).getTime() : null
+                row.banTimestamp = row.banTimestamp ? new Date(row.banTimestamp).getTime() : null
+				row.currentServerTime = new Date().getTime();
 			});
+
             // Send the results as a JSON response
             res.json(rows);
         } finally {
@@ -104,7 +107,8 @@ router.get("/v1/ban/discord/:uid", async (req, res) => {
 router.get("/v1/info", (req,res) => {
 	res.json({
 		commit_hash: execSync('git rev-parse HEAD').toString().trim(),
-		reasonFlags
+		reasonFlags,
+		currentServerTime: new Date().getTime()
 	})
 })