diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 837adce81d..8d36a25001 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -1142,7 +1142,12 @@ function get_the_tag_list( $before = '', $sep = '', $after = '', $id = 0 ) {
 function the_tags( $before = null, $sep = ', ', $after = '' ) {
 	if ( null === $before )
 		$before = __('Tags: ');
-	echo get_the_tag_list($before, $sep, $after);
+
+	$the_tags = get_the_tag_list( $before, $sep, $after );
+
+	if ( ! is_wp_error( $the_tags ) ) {
+		echo $the_tags;
+	}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 35dfc2f240..01ad23b478 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38776';
+$wp_version = '4.7-alpha-38777';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.