diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 167b5cf562..617bcb352d 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -148,7 +148,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		if ( $redirect_post ) {
 			$post_type_obj = get_post_type_object( $redirect_post->post_type );
 
-			if ( $post_type_obj->public && 'auto-draft' !== $redirect_post->post_status ) {
+			if ( $post_type_obj && $post_type_obj->public && 'auto-draft' !== $redirect_post->post_status ) {
 				$redirect_url = get_permalink( $redirect_post );
 
 				$redirect['query'] = _remove_qs_args_if_not_in_url(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5ac55b9643..dee50eb0d9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49923';
+$wp_version = '5.7-alpha-49924';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.