Index: modules/forum/forum.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.admin.inc,v
retrieving revision 1.28
diff -u -p -r1.28 forum.admin.inc
--- modules/forum/forum.admin.inc	3 Jan 2010 21:01:04 -0000	1.28
+++ modules/forum/forum.admin.inc	3 Jan 2010 22:22:27 -0000
@@ -243,10 +243,12 @@ function forum_overview($form, &$form_st
       $term = $form[$key]['#term'];
       $form[$key]['view']['#markup'] = l($term['name'], 'forum/' . $term['tid']);
       if (in_array($form[$key]['#term']['tid'], variable_get('forum_containers', array()))) {
-        $form[$key]['edit']['#markup'] = l(t('edit container'), 'admin/structure/forum/edit/container/' . $term['tid']);
+        $form[$key]['edit']['#title'] = t('edit container');
+        $form[$key]['edit']['#href'] = 'admin/structure/forum/edit/container/' . $term['tid'];
       }
       else {
-        $form[$key]['edit']['#markup'] = l(t('edit forum'), 'admin/structure/forum/edit/forum/' . $term['tid']);
+        $form[$key]['edit']['#title'] = t('edit forum');
+        $form[$key]['edit']['#href'] = 'admin/structure/forum/edit/forum/' . $term['tid'];
       }
     }
   }
Index: modules/forum/forum.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.install,v
retrieving revision 1.40
diff -u -p -r1.40 forum.install
--- modules/forum/forum.install	10 Dec 2009 15:52:56 -0000	1.40
+++ modules/forum/forum.install	3 Jan 2010 22:22:27 -0000
@@ -20,6 +20,9 @@ function forum_install() {
   variable_set('node_options_forum', array('status'));
 }
 
+/**
+ * Implements hook_enable().
+ */
 function forum_enable() {
   // Get info on the field "taxonomy_forums".
   $field_check = field_info_field("taxonomy_forums");
@@ -56,6 +59,16 @@ function forum_enable() {
     field_create_instance($instance);
 
     variable_set('forum_nav_vocabulary', $vocabulary->vid);
+
+    // Create a default forum so forum posts can be created.
+    $edit = array(
+      'name' => t('General discussion'),
+      'description' => '',
+      'parent' => array(0),
+      'vid' => $vocabulary->vid,
+    );
+    $term = (object) $edit;
+    taxonomy_term_save($term);
   }
 }
 
@@ -73,6 +86,7 @@ function forum_uninstall() {
   variable_del('forum_block_num_active');
   variable_del('forum_block_num_new');
   variable_del('node_options_forum');
+  variable_del('forum_nav_vocabulary');
 }
 
 /**
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.546
diff -u -p -r1.546 forum.module
--- modules/forum/forum.module	26 Dec 2009 16:50:09 -0000	1.546
+++ modules/forum/forum.module	3 Jan 2010 22:22:27 -0000
@@ -281,12 +281,17 @@ function forum_node_validate($node, $for
       $containers = variable_get('forum_containers', array());
       foreach ($node->taxonomy_forums[$langcode] as $item) {
         $term = taxonomy_term_load($item['tid']);
-        $used = db_query_range('SELECT 1 FROM {taxonomy_term_data} WHERE tid = :tid AND vid = :vid',0 , 1, array(
-          ':tid' => $term->tid,
-          ':vid' => $term->vid,
-        ))->fetchField();
-        if ($used && in_array($term->tid, $containers)) {
-          form_set_error('taxonomy_forums', t('The item %forum is only a forum container. Select one of the forums below it.', array('%forum' => $term->name)));
+        if (!$term) {
+          form_set_error('taxonomy_forums', t('You must select a forum.'));
+        }
+        else {
+          $used = db_query_range('SELECT 1 FROM {taxonomy_term_data} WHERE tid = :tid AND vid = :vid',0 , 1, array(
+            ':tid' => $term->tid,
+            ':vid' => $term->vid,
+          ))->fetchField();
+          if ($used && in_array($term->tid, $containers)) {
+            form_set_error('taxonomy_forums', t('The item %forum is only a forum container. Select one of the forums below it.', array('%forum' => $term->name)));
+          }
         }
       }
     }