diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 1f6228434..cd01e7097 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -1026,7 +1026,11 @@ class wpdb {
 	function db_connect() {
 		global $db_list, $global_db_list;
 
-		$this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+		if ( WP_DEBUG ) {
+			$this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+		} else {
+			$this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+		}
 
 		if ( !$this->dbh ) {
 			$this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
@@ -1039,6 +1043,9 @@ class wpdb {
 </ul>
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
 "/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
+			
+			//If show errors is disabled then we need to die anyway as we don't have a working DB connection
+			die();
 		}
 
 		$this->set_charset( $this->dbh );