diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
index 95904060ce..fd7dfe08db 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -3264,7 +3264,7 @@ class WP_Query {
 					$matched_taxonomy = reset( $queried_taxonomies );
 					$query = $tax_query_in_and[ $matched_taxonomy ];
 
-					if ( $query['terms'] ) {
+					if ( ! empty( $query['terms'] ) ) {
 						if ( 'term_id' == $query['field'] ) {
 							$term = get_term( reset( $query['terms'] ), $matched_taxonomy );
 						} else {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d5c1bd3620..416806f577 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38584';
+$wp_version = '4.7-alpha-38585';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.