diff --git a/phpBB/phpbb/db/tools/doctrine.php b/phpBB/phpbb/db/tools/doctrine.php
index bd3f71f83a..63de0c8832 100644
--- a/phpBB/phpbb/db/tools/doctrine.php
+++ b/phpBB/phpbb/db/tools/doctrine.php
@@ -478,7 +478,7 @@ class doctrine implements tools_interface
 		catch (Exception $e)
 		{
 			// @todo: check if it makes sense to properly handle the exception
-			return false;
+			return $e->getMessage();
 		}
 	}
 
diff --git a/phpBB/phpbb/install/helper/database.php b/phpBB/phpbb/install/helper/database.php
index 7f911ec999..5b1e74a807 100644
--- a/phpBB/phpbb/install/helper/database.php
+++ b/phpBB/phpbb/install/helper/database.php
@@ -405,6 +405,7 @@ class database
 			}
 
 			// Check if database version is supported
+			/** @psalm-suppress UndefinedInterfaceMethod */
 			$db_server_version = $doctrine_db->getWrappedConnection()->getServerVersion();
 			switch ($dbms)
 			{