diff --git a/wp-admin/install.php b/wp-admin/install.php
index 545461f485..6f4d7e3e79 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -66,9 +66,10 @@ switch($step) {
 <?php
 		break;
 	case 2:
-	  if ( !empty($wpdb->error) )
-		wp_die($wpdb->error->get_error_message());
-	display_header();	
+		if ( !empty($wpdb->error) )
+			wp_die($wpdb->error->get_error_message());
+
+		display_header();	
 		// Fill in the data we gathered
 		$weblog_title = stripslashes($_POST['weblog_title']);
 		$admin_email = stripslashes($_POST['admin_email']);
@@ -82,8 +83,9 @@ switch($step) {
 			die(__('<strong>ERROR</strong>: that isn\'t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>'));
 		}
 
-	$result = wp_install($weblog_title, 'admin', $admin_email, $public);
-	extract($result, EXTR_SKIP);
+		$wpdb->show_errors();
+		$result = wp_install($weblog_title, 'admin', $admin_email, $public);
+		extract($result, EXTR_SKIP);
 ?>
 
 <h1><?php _e('Success!'); ?></h1>
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 82c4ac20c2..5c5af7601f 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -55,6 +55,9 @@ class wpdb {
 	function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
 		register_shutdown_function(array(&$this, "__destruct"));
 
+		if ( defined('WP_DEBUG') and WP_DEBUG == true )
+			$this->show_errors();
+
 		if ( defined('DB_CHARSET') )
 			$this->charset = DB_CHARSET;