diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 4c8d9e68ca..b2aebe199d 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -786,15 +786,17 @@ class WP_Rewrite {
 
 		//get pages in order of hierarchy, i.e. children after parents
 		$posts = get_page_hierarchy($wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page'"));
+		
+		// If we have no pages get out quick
+		if ( !$posts )
+			return array( array(), array() );
+
 		//now reverse it, because we need parents after children for rewrite rules to work properly
 		$posts = array_reverse($posts, true);
 
 		$page_uris = array();
 		$page_attachment_uris = array();
 
-		if ( !$posts )
-			return array( array(), array() );
-
 		foreach ($posts as $id => $post) {
 			// URL => page name
 			$uri = get_page_uri($id);