diff --git a/wp-admin/page.php b/wp-admin/page.php
index 654f84090..9f28bc215 100644
--- a/wp-admin/page.php
+++ b/wp-admin/page.php
@@ -45,6 +45,8 @@ case 'edit':
 	$page_ID = $post_ID = $p = (int) $_GET['post'];
 	$post = get_post_to_edit($page_ID);
 
+	if ( empty($post->ID) ) wp_die( __("You attempted to edit a page that doesn't exist. Perhaps it was deleted?") );
+
 	if ( 'post' == $post->post_type ) {
 		wp_redirect("post.php?action=edit&post=$post_ID");
 		exit();
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 300677368..8f3574f27 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -48,6 +48,8 @@ case 'edit':
 	$post_ID = $p = (int) $_GET['post'];
 	$post = get_post($post_ID);
 
+	if ( empty($post->ID) ) wp_die( __("You attempted to edit a post that doesn't exist. Perhaps it was deleted?") );
+
 	if ( 'page' == $post->post_type ) {
 		wp_redirect("page.php?action=edit&post=$post_ID");
 		exit();