diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 5a8ad87ef7..d08abc108d 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -142,7 +142,9 @@ else :
 </label></li>
 </ul>
 	<?php
-	if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) === get_option( 'page_on_front' ) ) :
+	if ( 'page' === get_option( 'show_on_front' )
+		&& get_option( 'page_for_posts' ) === get_option( 'page_on_front' )
+	) :
 		wp_admin_notice(
 			__( '<strong>Warning:</strong> these pages should not be the same!' ),
 			array(
@@ -152,7 +154,13 @@ else :
 			)
 		);
 	endif;
-	if ( get_option( 'wp_page_for_privacy_policy' ) === get_option( 'page_for_posts' ) || get_option( 'wp_page_for_privacy_policy' ) === get_option( 'page_on_front' ) ) :
+
+	$privacy_policy_page = get_option( 'wp_page_for_privacy_policy' );
+
+	if ( $privacy_policy_page
+		&& ( get_option( 'page_for_posts' ) === $privacy_policy_page
+			|| get_option( 'page_on_front' ) === $privacy_policy_page )
+	) :
 		wp_admin_notice(
 			__( '<strong>Warning:</strong> these pages should not be the same as your Privacy Policy page!' ),
 			array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cf31f19e4f..253661c06e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-alpha-61497';
+$wp_version = '7.0-alpha-61498';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.