diff --git a/helios/templates/election_questions.html b/helios/templates/election_questions.html
index f9aa61dae..d7b8f7353 100644
--- a/helios/templates/election_questions.html
+++ b/helios/templates/election_questions.html
@@ -49,13 +49,19 @@ <h3 class="title">{{election.name}} &mdash; Questions <span style="font-size:0.7
           new_q.answer_urls[i-1] = form['answer_url_' +i].value;
       }
       
-     return new_q;
+      if (new_q.answers.length == 0) {
+        return null;
+      }
+      
+      return new_q;
   }
 
   function question_add(form) {
       var new_q = get_question_from_form(form);
-      QUESTIONS.push(new_q);
-      save_questions(refresh);
+      if (new_q) {
+        QUESTIONS.push(new_q);
+        save_questions(refresh);
+      }
   }
   
   function question_remove(q_num) {