diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 6514a631b..39e68594b 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -533,7 +533,7 @@ function wp_tag_cloud( $args = '' ) {
 
 	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
 
-	if ( empty( $tags ) )
+	if ( empty( $tags ) || is_wp_error( $tags ) )
 		return;
 
 	foreach ( $tags as $key => $tag ) {