diff --git a/DataStorage/Database/Connection/MysqlConnection.php b/DataStorage/Database/Connection/MysqlConnection.php
index 40b9b1fb7..05d23b585 100644
--- a/DataStorage/Database/Connection/MysqlConnection.php
+++ b/DataStorage/Database/Connection/MysqlConnection.php
@@ -74,6 +74,8 @@ class MysqlConnection extends ConnectionAbstract
         } catch (\PDOException $e) {
             $this->status = DatabaseStatus::MISSING_DATABASE;
             $this->con    = null;
+        } finally {
+            $this->dbdata['password'] = '****';
         }
     }
 
diff --git a/DataStorage/Database/Pool.php b/DataStorage/Database/Pool.php
index 86395ab83..960ee0a73 100644
--- a/DataStorage/Database/Pool.php
+++ b/DataStorage/Database/Pool.php
@@ -62,7 +62,7 @@ class Pool
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function add($key = 'core', ConnectionAbstract $db) : bool
+    public function add(string $key = 'core', ConnectionAbstract $db) : bool
     {
         if (isset($this->pool[$key])) {
             return false;
@@ -83,7 +83,7 @@ class Pool
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function get($key = 'core')
+    public function get(string $key = 'core')
     {
         if (!isset($this->pool[$key])) {
             return false; /* todo: return nullconnection */
@@ -102,7 +102,7 @@ class Pool
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function remove($key) : bool
+    public function remove(string $key) : bool
     {
         if (!isset($this->pool[$key])) {
             return false;