diff --git a/wp-blog-header.php b/wp-blog-header.php
index 6118ec8eaa..002d2e1c31 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -109,9 +109,10 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
 // Sending HTTP headers
 
 if ( !empty($error) && '404' == $error ) {
-	header('HTTP/1.x 404 Not Found');
+	@header('HTTP/1.x 404 Not Found');
  } else if ( empty($feed) ) {
 	@header('X-Pingback: '. get_bloginfo('pingback_url'));
+	@header('Content-type: text/html; charset=' . get_option('blog_charset'));
 } else {
 	// We're showing a feed, so WP is indeed the only thing that last changed
 	if ( $withcomments )