Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.73
diff -u -p -r1.73 node.pages.inc
--- modules/node/node.pages.inc	4 Aug 2009 06:44:48 -0000	1.73
+++ modules/node/node.pages.inc	17 Aug 2009 18:31:45 -0000
@@ -13,7 +13,18 @@
 function node_page_edit($node) {
   $type_name = node_type_get_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 {
+    $page = array();
+    if (user_access('administer content types')) {
+      $types_link = l(t(' Edit content types.'), 'admin/structure/types');
+    }
+    drupal_set_message(t('This content cannot be edited because the content type %type has been disabled or removed.', array('%type' => $node->type)) . $types_link, 'error');
+    return $page;
+  }
 }
 
 function node_add_page() {