Index: advpoll.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advpoll/advpoll.module,v
retrieving revision 1.21.2.69
diff -u -p -r1.21.2.69 advpoll.module
--- advpoll.module	4 Oct 2007 07:02:52 -0000	1.21.2.69
+++ advpoll.module	6 Oct 2007 14:01:43 -0000
@@ -274,7 +274,7 @@ function advpoll_form($node, $form_value
     $choices = max(2, count($node->choice) ? count($node->choice) : ADVPOLL_INITIAL_CHOICES);
   }
 
-  if (variable_get('advpoll_use_question_'. $type->type, ADVPOLL_USE_QUESTION) || $node->question !== '') {
+  if (variable_get('advpoll_use_question_'. $type->type, ADVPOLL_USE_QUESTION) || (isset($node->question) && $node->question !== '')) {
     $form['question'] = array(
       '#type' => 'textfield',
       '#title' => t('Question'),
@@ -562,7 +562,7 @@ function advpoll_form_alter($form_id, &$
       $form['advpoll']['advpoll_use_question'] = array(
         '#type' => 'checkbox',
         '#title' => t('Use question field'),
-        '#description' => t('Use a dedicated question field instead of a combined question and title field. Rename <em>Title field label</em> above if this is checked.'),
+        '#description' => t('Use a dedicated question field instead of a combined question and title field. It is recommended to rename <em>Title field label</em> above to "Title" or similar if this is checked.'),
         '#default_value' => variable_get('advpoll_use_question_'. $node_type, ADVPOLL_USE_QUESTION),
       );
     }