diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 3ee0ac5506..e2222980c5 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -551,13 +551,15 @@ class Walker_Page extends Walker {
 
 		extract($args, EXTR_SKIP);
 		$css_class = 'page_item page-item-'.$page->ID;
-		$_current_page = get_page( $current_page );
-		if ( in_array($page->ID, (array) $_current_page->ancestors) )
-			$css_class .= ' current_page_ancestor';
-		if ( $page->ID == $current_page )
-			$css_class .= ' current_page_item';
-		elseif ( $_current_page && $page->ID == $_current_page->post_parent )
-			$css_class .= ' current_page_parent';
+		if ( !empty($current_page) ) {
+			$_current_page = get_page( $current_page );
+			if ( in_array($page->ID, (array) $_current_page->ancestors) )
+				$css_class .= ' current_page_ancestor';
+			if ( $page->ID == $current_page )
+				$css_class .= ' current_page_item';
+			elseif ( $_current_page && $page->ID == $_current_page->post_parent )
+				$css_class .= ' current_page_parent';
+		}
 
 		$output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page->ID) . '" title="' . attribute_escape(apply_filters('the_title', $page->post_title)) . '">' . apply_filters('the_title', $page->post_title) . '</a>';
 
diff --git a/wp-includes/query.php b/wp-includes/query.php
index a892c62cf1..8f01e65c4b 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -819,6 +819,7 @@ class WP_Query {
 		$join = '';
 		$search = '';
 		$groupby = '';
+		$post_status_join = false;
 
 		if ( !isset($q['post_type']) ) {
 			if ( $this->is_search )