diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 13d9d44bd8..1e6d9fa3bc 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -337,6 +337,11 @@ function edit_post( $post_data = null ) {
 
 			$clean_terms = array();
 			foreach ( $terms as $term ) {
+				// Empty terms are invalid input.
+				if ( empty( $term ) ) {
+					continue;
+				}
+
 				$_term = get_terms( $taxonomy, array(
 					'name' => $term,
 					'fields' => 'ids',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 04cf13a367..d3c5c4d332 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31391';
+$wp_version = '4.2-alpha-31392';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.