Index: wp-content/themes/twentytwelve/archive.php
===================================================================
--- wp-content/themes/twentytwelve/archive.php	(revision 21271)
+++ wp-content/themes/twentytwelve/archive.php	(working copy)
@@ -26,23 +26,29 @@
 				} elseif ( is_year() ) {
 					printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
 				} elseif ( is_tag() ) {
-					printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-					// Show an optional tag description
-					$tag_description = tag_description();
-					if ( $tag_description )
-						echo '<div class="tag-archive-meta">' . $tag_description . '</div>';
+					printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );	
 				} elseif ( is_category() ) {
 					printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-					// Show an optional category description
-					$category_description = category_description();
-					if ( $category_description )
-						echo '<div class="category-archive-meta">' . $category_description . '</div>';
 				} else {
 					_e( 'Blog Archives', 'twentytwelve' );
 				}
 			?></h1>
 
-			<?php
+			<?php			
+			if ( is_tag() ) {
+				// Show an optional tag description
+				$tag_description = tag_description();
+				if ( $tag_description )
+					echo '<div class="tag-archive-meta">' . $tag_description . '</div>';
+			}
+			
+			if ( is_category() ) {
+				// Show an optional category description
+				$category_description = category_description();
+				if ( $category_description )
+					echo '<div class="category-archive-meta">' . $category_description . '</div>';
+			}
+			
 			/* Start the Loop */
 			while ( have_posts() ) : the_post();
 
