diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index c1fe1eb808..e416931d00 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -276,7 +276,9 @@ switch($step) {
 	if ( ! empty( $wpdb->error ) )
 		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
 
+	$errors = $wpdb->hide_errors();
 	$wpdb->query( "SELECT $prefix" );
+	$wpdb->show_errors( $errors );
 	if ( ! $wpdb->last_error ) {
 		// MySQL was able to parse the prefix as a value, which we don't want. Bail.
 		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6775201b05..27f4c97a25 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41630';
+$wp_version = '4.9-alpha-41631';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.