diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 32c173df50..1ad40fcb6a 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -278,6 +278,12 @@ switch($step) {
 	if ( ! empty( $wpdb->error ) )
 		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
 
+	$wpdb->query( "SELECT $prefix" );
+	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.' ) );
+	}
+
 	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
 	try {
 		$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 012b1e72a3..5b6c886075 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37580';
+$wp_version = '4.6-alpha-37581';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.