diff --git a/lib/classes/database/class.Database.php b/lib/classes/database/class.Database.php
index 7a5ccc81..7c39ecfb 100644
--- a/lib/classes/database/class.Database.php
+++ b/lib/classes/database/class.Database.php
@@ -365,6 +365,11 @@ class Database {
 			$error_trace = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_trace);
 			$error_trace = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_trace);
 
+			if ($error->getCode() == 2003) {
+			    $error_message = "Unable to connect to database. Either the mysql-server is not running or your user/password is wrong.";
+			    $error_trace = "";
+			}
+
 			// clean up sensitive data
 			unset($sql);
 			unset($sql_root);