diff --git a/src/server.ts b/src/server.ts
index 3b8eefa..5e65b91 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -69,10 +69,16 @@ app.use((error: any, _request: express.Request, response: express.Response, _nex
 	}));
 });
 
-// Starts the server
-LOG_INFO('Starting server');
-connectDatabase().then(() => {
+async function main(): Promise<void> {
+	// Starts the server
+	LOG_INFO('Starting server');
+
+	await connectDatabase();
+	// TODO - Connect to account DB here too?
+
 	app.listen(port, () => {
 		LOG_SUCCESS(`Server started on port ${port}`);
 	});
-});
\ No newline at end of file
+}
+
+main().catch(console.error);
\ No newline at end of file