Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.66
diff -u -r1.66 node.pages.inc
--- modules/node/node.pages.inc	25 May 2009 15:39:12 -0000	1.66
+++ modules/node/node.pages.inc	28 May 2009 04:44:42 -0000
@@ -13,7 +13,17 @@
 function node_page_edit($node) {
   $type_name = node_get_types('name', $node);
   drupal_set_title(t('<em>Edit @type</em> @title', array('@type' => $type_name, '@title' => $node->title)), PASS_THROUGH);
-  return drupal_get_form($node->type . '_node_form', $node);
+
+  if ($type_name) {
+    return drupal_get_form($node->type . '_node_form', $node);
+  }
+  else {
+    drupal_set_message(t('The content type @type has been disabled or removed. You can no longer edit this content until the content type is re-enabled or re-created.', array('@type' => $node->type)), 'error');
+    if (user_access('administer content types')) {
+      $page['check_content']['#markup'] = l(t('View content types.'), 'admin/build/types');
+    }
+    return drupal_get_page($page);
+  }
 }
 
 function node_add_page() {