diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php
index 8b72a1ac43..68aef76ee0 100644
--- a/wp-content/themes/twentyten/category.php
+++ b/wp-content/themes/twentyten/category.php
@@ -3,13 +3,9 @@
 		<div id="container">
 			<div id="content">
 
-<?php the_post(); ?>
-
 				<h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ); ?> <span><?php single_cat_title(); ?></span></span></h1>
 				<?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
 
-<?php rewind_posts(); ?>
-
 <?php get_generic_template( 'loop', 'category' ); ?>
 
 			</div><!-- #content -->
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index 0bda3a0cf8..056bcc4d89 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -5,6 +5,16 @@
 	</div><!-- #nav-above -->
 <?php } ?>
 
+<?php if ( ! have_posts() ) : ?>
+	<div id="post-0" class="post error404 not-found">
+		<h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
+		<div class="entry-content">
+			<p><?php _e( 'Apologies, but no results were found for the requested Archive. Perhaps searching will help find a related post.', 'twentyten' ); ?></p>
+			<?php get_search_form(); ?>
+		</div><!-- .entry-content -->
+	</div><!-- #post-0 -->
+<?php endif; ?>
+
 <?php while ( have_posts() ) : the_post(); ?>
 <?php if ( in_category( 'Gallery' ) ) { ?>
 	<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>