diff --git a/docker_dev/compose.yaml b/docker_dev/compose.yaml
index 59669fd..1b9493d 100644
--- a/docker_dev/compose.yaml
+++ b/docker_dev/compose.yaml
@@ -6,10 +6,11 @@ services:
         ports:
             - 8081:80
         environment:
-          MYSQL_HOST: mysql
           MYSQL_USER: root
           MYSQL_PASSWORD: example
           MYSQL_DATABASE: dragon_fire
+          MYSQL_HOST: mysql
+          MYSQL_PORT: 3306
         develop:
             watch:
                 - path: ./
diff --git a/www/mysql_adapter.php b/www/mysql_adapter.php
index 5f663f8..168feb7 100644
--- a/www/mysql_adapter.php
+++ b/www/mysql_adapter.php
@@ -9,24 +9,29 @@ class MySQLAdapter {
 	function __construct() {
 		$db_params = json_decode(file_get_contents('secrets/db.json'), true);
 
-		if(null !== getenv('MYSQL_HOST')) {
-			$this->raw = mysqli_connect(getenv('MYSQL_HOST'), 
-				getenv('MYSQL_USER'), getenv('MYSQL_PASSWORD'), getenv('MYSQL_DATABASE'));
-		}
-		else {
-			$this->raw = mysqli_connect($db_params['MYSQL_HOST'], 
-				$db_params['MYSQL_USER'], $db_params['MYSQL_PASSWORD'], $db_params['MYSQL_DATABASE']);
-		}
-
-		$this->data_directory = 'raw';
-
-		if (!$this->raw)
-		{
+		try {
+			if(false !== getenv('MYSQL_HOST')) {
+				$this->raw = mysqli_connect(getenv('MYSQL_HOST'), 
+					getenv('MYSQL_USER'), getenv('MYSQL_PASSWORD'), 
+					getenv('MYSQL_DATABASE'),
+					getenv('MYSQL_PORT'));
+			}
+			else {
+				$this->raw = mysqli_connect($db_params['MYSQL_HOST'], 
+					$db_params['MYSQL_USER'], $db_params['MYSQL_PASSWORD'], 
+					$db_params['MYSQL_DATABASE'],
+					$db_params['MYSQL_PORT']);
+			}
+		} catch (\Throwable $th) {
 			echo 'Connection failed<br>';
 			echo 'Error number: ' . mysqli_connect_errno() . '<br>';
 			echo 'Error message: ' . mysqli_connect_error() . '<br>';
 			die();
+
+			//throw $th;
 		}
+
+		$this->data_directory = 'raw';
 	}
 
 	function _exec($qery, $argtypes, ...$args) {
diff --git a/www/router.php b/www/router.php
index f43829d..21cebbf 100644
--- a/www/router.php
+++ b/www/router.php
@@ -49,8 +49,6 @@ if($SURI == '/') {
     } elseif($SURI == '/api/upload') {
         
         if(array_key_exists('post_data', $_FILES)) {
-
-
             $adapter->handle_upload($_POST['post_path'], $_FILES['post_data']['tmp_name']);
         }