diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index bedd548..2ff2778 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -270,7 +270,7 @@ function _forum_node_check_node_type($node) {
 function forum_node_view($node, $view_mode) {
   $vid = variable_get('forum_nav_vocabulary', 0);
   $vocabulary = taxonomy_vocabulary_load($vid);
-  if (_forum_node_check_node_type($node)) {
+  if (_forum_node_check_node_type($node) && !empty($node->forum_tid)) {
     if (node_is_page($node)) {
       // Breadcrumb navigation
       $breadcrumb[] = l(t('Home'), NULL);
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index 881899a..62b6138 100644
--- a/modules/forum/forum.test
+++ b/modules/forum/forum.test
@@ -51,6 +51,9 @@ class ForumTestCase extends DrupalWebTestCase {
     // Create another forum node for the any forum user.
     $node = $this->createForumTopic($this->forum, FALSE);
 
+    // Create a forum node for the any forum user, without assigning the node to a forum.
+    $node = $this->createForumTopic($this->forum, FALSE, TRUE);
+
     // Do basic tests for the own forum user.
     $this->doBasicTests($this->own_user, FALSE);
 
@@ -66,8 +69,8 @@ class ForumTestCase extends DrupalWebTestCase {
 
     // Verify the topic and post counts on the forum page.
     $this->drupalGet('forum');
-    $this->assertRaw("<td class=\"topics\">\n          6                  </td>");
-    $this->assertRaw('<td class="posts">6</td>');
+    $this->assertRaw("<td class=\"topics\">\n          7                  </td>");
+    $this->assertRaw('<td class="posts">7</td>');
 
     // Test loading multiple forum nodes on the front page.
     $this->drupalLogin($this->drupalCreateUser(array('administer content types', 'create forum content')));
@@ -258,9 +261,10 @@ class ForumTestCase extends DrupalWebTestCase {
    *
    * @param array $forum Forum array.
    * @param boolean $container True if $forum is a container.
+   * @param boolean $assign_forum True to assign the topic to the forum.
    * @return object Topic node created.
    */
-  function createForumTopic($forum, $container = FALSE) {
+  function createForumTopic($forum, $container = FALSE, $assign_forum = TRUE) {
     // Generate a random subject/body.
     $title = $this->randomName(20);
     $body = $this->randomName(200);
@@ -271,8 +275,14 @@ class ForumTestCase extends DrupalWebTestCase {
       "body[$langcode][0][value]" => $body,
     );
 
-    // Create the forum topic, preselecting the forum ID via a URL parameter.
-    $this->drupalPost('node/add/forum/' . $forum['tid'], $edit, t('Save'));
+    // Create the forum topic.
+    if ($assign_forum) {
+      // Preselect the forum ID via a URL parameter.
+      $this->drupalPost('node/add/forum/' . $forum['tid'], $edit, t('Save'));
+    }
+    else {
+      $this->drupalPost('node/add/forum', $edit, t('Save'));
+    }
 
     $type = t('Forum topic');
     if ($container) {
@@ -281,14 +291,19 @@ class ForumTestCase extends DrupalWebTestCase {
       return;
     }
     else {
-      $this->assertRaw(t('@type %title has been created.', array('%title' => $title, '@type' => $type)), t('Forum topic was created'));
+      $this->assertRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), t('Forum topic was created'));
       $this->assertNoRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), t('No error message was shown'));
     }
 
     // Retrieve node object, ensure that the topic was created and in the proper forum.
     $node = $this->drupalGetNodeByTitle($title);
     $this->assertTrue($node != NULL, t('Node @title was loaded', array('@title' => $title)));
-    $this->assertEqual($node->taxonomy_forums[LANGUAGE_NONE][0]['tid'], $forum['tid'], 'Saved forum topic was in the expected forum');
+    if ($assign_forum) {
+      $this->assertEqual($node->taxonomy_forums[LANGUAGE_NONE][0]['tid'], $forum['tid'], 'Saved forum topic was in the expected forum');
+    }
+    else {
+      $this->assertNull($node->taxonomy_forums[LANGUAGE_NONE][0]['tid'], 'Saved forum topic was in no forum');
+    }
 
     // View forum topic.
     $this->drupalGet('node/' . $node->nid);