diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index c06d274f20d..a36f8a1ffa6 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -184,7 +184,7 @@ class survey_page(osv.osv):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
                 data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
         if context.has_key('survey_id'):
-            data['survey_id'] = context['survey_id']
+            data['survey_id'] = context.get('survey_id', False)
         return data
 
     def survey_save(self, cr, uid, ids, context=None):
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 23315d51c65..0d541079ba6 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -297,8 +297,9 @@ class survey_question_wiz(osv.osv_memory):
                                 fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'datetime', 'string':ans.answer}
 
                         elif que_rec.type == 'descriptive_text':
-                            for que_test in que_rec.descriptive_text.split('\n'):
-                                etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+                            if que_rec.descriptive_text:
+                                for que_test in que_rec.descriptive_text.split('\n'):
+                                    etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
 
                         elif que_rec.type == 'single_textbox':
                             etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_single", 'nolabel':"1" ,'colspan':"4"})