diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index b47a8fb6ca..3850eb274c 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -112,13 +112,12 @@
 	<?php endif; ?>
 
 			<div class="entry-utility">
-				<span class="cat-links">
-					<span class="entry-utility-prep entry-utility-prep-cat-links">
-					<?php
-						printf( __('Posted in %s', 'twentyten' ), '</span> '.get_the_category_list( ', ' ) );
-					?>					
-				</span>
-				<span class="meta-sep">|</span>
+				<?php if ( count( get_the_category() ) ) : ?>
+					<span class="cat-links">
+						<span class="entry-utility-prep entry-utility-prep-cat-links"><?php printf( __('Posted in %s', 'twentyten' ), '</span> '.get_the_category_list( ', ' ) ); ?>
+					</span>
+					<span class="meta-sep">|</span>
+				<?php endif; ?>
 				<?php
 					$tags_list = get_the_tag_list( '', ', ' );
 					if ( $tags_list ):
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 9f82abb022..6177b17cf9 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -175,6 +175,9 @@ function get_the_category_by_ID( $cat_ID ) {
 function get_the_category_list( $separator = '', $parents='', $post_id = false ) {
 	global $wp_rewrite;
 	$categories = get_the_category( $post_id );
+	if ( !is_object_in_taxonomy( get_post_type( $post_id ), 'category' ) )
+		return apply_filters( 'the_category', '', $separator, $parents );
+
 	if ( empty( $categories ) )
 		return apply_filters( 'the_category', __( 'Uncategorized' ), $separator, $parents );