Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php	(revision 18542)
+++ wp-includes/taxonomy.php	(working copy)
@@ -2994,7 +2994,7 @@
 			$t['template'] = $template;
 
 		$terms = get_object_term_cache($post->ID, $taxonomy);
-		if ( empty($terms) )
+		if ( false === $terms )
 			$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 
 		$links = array();
Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 18542)
+++ wp-admin/includes/media.php	(working copy)
@@ -1123,7 +1123,7 @@
 			$t['args'] = array();
 
 		$terms = get_object_term_cache($post->ID, $taxonomy);
-		if ( empty($terms) )
+		if ( false === $terms )
 			$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 
 		$values = array();