diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index e241fd1c13267e7508f1ee517fa196e8d7b53342..a059718fdcb6aae9b5725e4448743da8736b9284 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -286,7 +286,7 @@ function forum_node_validate($node, $form) {
           ':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)));
+          form_set_error('taxonomy_forums', t('The item %forum is a forum container, not a forum. Select one of the forums below instead.', array('%forum' => $term->name)));
         }
       }
     }
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index 5499d461487737a4335a9d1b77684f8d08ecd578..4b673b7077b80fd29be7ec58d6151c185c994e34 100644
--- a/modules/forum/forum.test
+++ b/modules/forum/forum.test
@@ -281,12 +281,12 @@ class ForumTestCase extends DrupalWebTestCase {
     $type = t('Forum topic');
     if ($container) {
       $this->assertNoRaw(t('@type %title has been created.', array('@type' => $type, '%title' => $title)), t('Forum topic was not created'));
-      $this->assertRaw(t('The item %title is only a forum container.', array('%title' => $forum['name'])), t('Error message was shown'));
+      $this->assertRaw(t('The item %title is a forum container, not a forum.', array('%title' => $forum['name'])), t('Error message was shown'));
       return;
     }
     else {
       $this->assertRaw(t('@type %title has been created.', array('%title' => $title, '@type' => $type)), t('Forum topic was created'));
-      $this->assertNoRaw(t('The item %title is only a forum container.', array('%title' => $forum['name'])), t('No error message was shown'));
+      $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.