diff --git a/wp-content/themes/twentyeleven/archive.php b/wp-content/themes/twentyeleven/archive.php
index a5c8a6a06..22873b67e 100644
--- a/wp-content/themes/twentyeleven/archive.php
+++ b/wp-content/themes/twentyeleven/archive.php
@@ -17,6 +17,8 @@ get_header(); ?>
 		<section id="primary">
 			<div id="content" role="main">
 
+			<?php if ( have_posts() ) : ?>
+
 				<header class="page-header">
 					<h1 class="page-title">
 						<?php if ( is_day() ) : ?>
@@ -48,6 +50,21 @@ get_header(); ?>
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
+			<?php else : ?>
+
+				<article id="post-0" class="post no-results not-found">
+					<header class="entry-header">
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+					</header><!-- .entry-header -->
+
+					<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.', 'twentyeleven' ); ?></p>
+						<?php get_search_form(); ?>
+					</div><!-- .entry-content -->
+				</article><!-- #post-0 -->
+
+			<?php endif; ?>
+
 			</div><!-- #content -->
 		</section><!-- #primary -->
 
diff --git a/wp-content/themes/twentyeleven/author.php b/wp-content/themes/twentyeleven/author.php
index 2a87eee27..f9a2bfdca 100644
--- a/wp-content/themes/twentyeleven/author.php
+++ b/wp-content/themes/twentyeleven/author.php
@@ -12,6 +12,8 @@ get_header(); ?>
 		<section id="primary">
 			<div id="content" role="main">
 
+			<?php if ( have_posts() ) : ?>
+
 				<?php
 					/* Queue the first post, that way we know
 					 * what author we're dealing with (if that is the case).
@@ -19,8 +21,7 @@ get_header(); ?>
 					 * We reset this later so we can run the loop
 					 * properly with a call to rewind_posts().
 					 */
-					if ( have_posts() )
-						the_post();
+					the_post();
 				?>
 
 				<header class="page-header">
@@ -66,6 +67,21 @@ get_header(); ?>
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
+			<?php else : ?>
+
+				<article id="post-0" class="post no-results not-found">
+					<header class="entry-header">
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+					</header><!-- .entry-header -->
+
+					<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.', 'twentyeleven' ); ?></p>
+						<?php get_search_form(); ?>
+					</div><!-- .entry-content -->
+				</article><!-- #post-0 -->
+
+			<?php endif; ?>
+
 			</div><!-- #content -->
 		</section><!-- #primary -->
 
diff --git a/wp-content/themes/twentyeleven/category.php b/wp-content/themes/twentyeleven/category.php
index 653d88b42..539cbbdd3 100644
--- a/wp-content/themes/twentyeleven/category.php
+++ b/wp-content/themes/twentyeleven/category.php
@@ -12,6 +12,8 @@ get_header(); ?>
 		<section id="primary">
 			<div id="content" role="main">
 
+			<?php if ( have_posts() ) : ?>
+
 				<header class="page-header">
 					<h1 class="page-title"><?php
 						printf( __( 'Category Archives: %s', 'twentyeleven' ), '<span>' . single_cat_title( '', false ) . '</span>' );
@@ -41,6 +43,21 @@ get_header(); ?>
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
+			<?php else : ?>
+
+				<article id="post-0" class="post no-results not-found">
+					<header class="entry-header">
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+					</header><!-- .entry-header -->
+
+					<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.', 'twentyeleven' ); ?></p>
+						<?php get_search_form(); ?>
+					</div><!-- .entry-content -->
+				</article><!-- #post-0 -->
+
+			<?php endif; ?>
+
 			</div><!-- #content -->
 		</section><!-- #primary -->
 
diff --git a/wp-content/themes/twentyeleven/index.php b/wp-content/themes/twentyeleven/index.php
index b65512f6d..f955f3499 100644
--- a/wp-content/themes/twentyeleven/index.php
+++ b/wp-content/themes/twentyeleven/index.php
@@ -17,6 +17,8 @@ get_header(); ?>
 		<div id="primary">
 			<div id="content" role="main">
 
+			<?php if ( have_posts() ) : ?>
+
 				<?php twentyeleven_content_nav( 'nav-above' ); ?>
 
 				<?php /* Start the Loop */ ?>
@@ -28,6 +30,21 @@ get_header(); ?>
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
+			<?php else : ?>
+
+				<article id="post-0" class="post no-results not-found">
+					<header class="entry-header">
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+					</header><!-- .entry-header -->
+
+					<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.', 'twentyeleven' ); ?></p>
+						<?php get_search_form(); ?>
+					</div><!-- .entry-content -->
+				</article><!-- #post-0 -->
+
+			<?php endif; ?>
+
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
diff --git a/wp-content/themes/twentyeleven/tag.php b/wp-content/themes/twentyeleven/tag.php
index 58298da15..8180a8cf4 100644
--- a/wp-content/themes/twentyeleven/tag.php
+++ b/wp-content/themes/twentyeleven/tag.php
@@ -12,7 +12,7 @@ get_header(); ?>
 		<section id="primary">
 			<div id="content" role="main">
 
-				<?php the_post(); ?>
+			<?php if ( have_posts() ) : ?>
 
 				<header class="page-header">
 					<h1 class="page-title"><?php
@@ -26,8 +26,6 @@ get_header(); ?>
 					?>
 				</header>
 
-				<?php rewind_posts(); ?>
-
 				<?php twentyeleven_content_nav( 'nav-above' ); ?>
 
 				<?php /* Start the Loop */ ?>
@@ -45,6 +43,21 @@ get_header(); ?>
 
 				<?php twentyeleven_content_nav( 'nav-below' ); ?>
 
+			<?php else : ?>
+
+				<article id="post-0" class="post no-results not-found">
+					<header class="entry-header">
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+					</header><!-- .entry-header -->
+
+					<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.', 'twentyeleven' ); ?></p>
+						<?php get_search_form(); ?>
+					</div><!-- .entry-content -->
+				</article><!-- #post-0 -->
+
+			<?php endif; ?>
+
 			</div><!-- #content -->
 		</section><!-- #primary -->