Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1309
diff -u -p -r1.1309 node.module
--- modules/node/node.module	20 Oct 2010 08:15:33 -0000	1.1309
+++ modules/node/node.module	23 Oct 2010 09:08:34 -0000
@@ -612,16 +612,20 @@ function node_field_extra_fields() {
 /**
  * Deletes a node type from the database.
  *
- * @param $type
+ * @param $bundle_name
  *   The machine-readable name of the node type to be deleted.
  */
-function node_type_delete($type) {
-  $info = node_type_get_type($type);
+
+function node_type_delete($bundle_name) {
   db_delete('node_type')
-    ->condition('type', $type)
+    ->condition('type', $bundle_name)
     ->execute();
-  field_attach_delete_bundle('node', $type);
-  module_invoke_all('node_type_delete', $info);
+  field_attach_delete_bundle('node', $bundle_name);
+
+  $types = _node_types_build(TRUE)->types;
+  if (isset($types[$bundle_name])){
+    module_invoke_all('node_type_delete', $types[$bundle_name]);
+  }
 
   // Clear the node type cache.
   drupal_static_reset('_node_types_build');