diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 2426ae5eeed..f618a95cccf 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -145,10 +145,14 @@ class survey(osv.osv):
         return report
 
     def fill_survey(self, cr, uid, ids, context=None):
-        sur_obj = self.read(cr, uid, ids,['title'], context=context)
+        sur_obj = self.read(cr, uid, ids,['title', 'page_ids'], context=context)
         for sur in sur_obj:
             name = sur['title']
-            context.update({'active':False,'survey_id': ids[0]})
+            pages = sur['page_ids']
+            if not pages:
+                raise osv.except_osv(_('Warning!'), _('This survey has no question defined. Please define the questions and answers first.'))
+            else:
+                context.update({'active':False,'survey_id': ids[0]})
         return {
             'view_type': 'form',
             'view_mode': 'form',