diff --git a/help_popup/demo/help.xml b/help_popup/demo/help.xml
index 4679dc57..49b8ccee 100644
--- a/help_popup/demo/help.xml
+++ b/help_popup/demo/help.xml
@@ -16,7 +16,7 @@ Check lines below to learn more about this feature.
         </record>
 
         <record id="base.action_partner_form" model="ir.actions.act_window">
-            <field name="advanced_help"><![CDATA[
+            <field name="advanced_help_model"><![CDATA[
 <b>Hi Odoo community,</b>
 
 <h4>Main functionalities:</h4>
diff --git a/help_popup/models/action_window.py b/help_popup/models/action_window.py
index 7bf9ea34..8ea350b1 100644
--- a/help_popup/models/action_window.py
+++ b/help_popup/models/action_window.py
@@ -166,8 +166,9 @@ class IrActionsActwindow(models.Model):
     def remove_obsolete_help(self, module_name):
         """ We need to remove some partial content of the file """
         for field in ['advanced_help', 'advanced_help_model']:
-            tag = getattr(
-                BSHTML(self[field]), 'help_%s' % module_name)
+            if not self[field]:
+                continue
+            tag = getattr(BSHTML(self[field]), 'help_%s' % module_name)
             if tag:
                 old_content = ''.join(
                     [unicode(x) for x in tag.contents if x])