diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index c0bbd367f..004d4c85e 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -440,7 +440,7 @@ class WP {
 
 		$GLOBALS['query_string'] = $this->query_string;
 		$GLOBALS['posts'] = & $wp_query->posts;
-		$GLOBALS['post'] = $wp_query->post;
+		$GLOBALS['post'] = (isset($wp_query->post)) ? $wp_query->post : null;
 		$GLOBALS['request'] = $wp_query->request;
 
 		if ( is_single() || is_page() ) {