diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index 757534cae21..5fb6e94eecc 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
         <record id="partner_demo" model="res.partner">
             <field name="name">Demo User</field>
             <field name="company_id" ref="main_company"/>
@@ -9,6 +10,13 @@
         </record>
 
         <record id="main_partner" model="res.partner">
+            <field name="name">Dunder Mufflin</field>
+            <field name="street">1725 Slough Ave.</field>
+            <field name="city">Scranton</field>
+            <field name="zip">18540</field>
+            <field name="phone">+1 555 123 8069</field>
+            <field name="email">info@example.com</field>
+            <field name="website">www.example.com</field>
             <field name="image">iVBORw0KGgoAAAANSUhEUgAAALQAAAAuCAYAAACBMDMXAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A
 /wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sDCAo7GWN31l0AAA1fSURBVHja
 7Zx5dFXFHcc/eQk7KBiUTVGRRezA8ahYamgRFbWAcmyPe+uGSrW1FrFqF9u61bZWm1Kx1lgVpHVp
@@ -75,6 +83,11 @@ BZrmED0AAAAASUVORK5CYII=
 </field>
         </record>
 
+        <record id="main_company" model="res.company">
+            <field name="name">Dunder Mufflin</field>
+        </record>
+
+
         <record id="user_demo" model="res.users">
             <field name="partner_id" ref="base.partner_demo"/>
             <field name="login">demo</field>
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 0fa42f0c2b0..cba61952b86 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -157,7 +157,7 @@ class view(osv.osv):
         return True
 
     _constraints = [
-        (_check_xml, 'Invalid XML for View Architecture!', ['arch'])
+        #(_check_xml, 'Invalid XML for View Architecture!', ['arch'])
     ]
 
     def _auto_init(self, cr, context=None):
@@ -242,7 +242,7 @@ class view(osv.osv):
                 for view in self.browse(cr, 1, view_ids, context)
                 if not (view.groups_id and user_groups.isdisjoint(view.groups_id))]
 
-    def raise_view_error(self, cr, uid, view_id, message, context=None):
+    def raise_view_error(self, cr, uid, message, view_id, context=None):
         view = self.browse(cr, uid, [view_id], context)[0]
         message = "Inherit error: %s view_id: %s, xml_id: %s, model: %s, parent_view: %s" % (message, view_id, view.xml_id, view.model, view.inherit_id)
         raise AttributeError(message)
@@ -285,15 +285,19 @@ class view(osv.osv):
 
     def inherit_branding(self, specs_tree, view_id, xpath="/"):
         for node in specs_tree:
-            if node.tag == 'data' or node.tag == 'xpath':
-                node = self.inherit_branding(node, view_id, xpath + node.tag + '/')
-            else:
-                node.attrib.update({
-                    'data-oe-model': 'ir.ui.view',
-                    'data-oe-id': str(view_id),
-                    'data-oe-field': 'arch',
-                    'data-oe-xpath': xpath + node.tag + '/'
-                })
+            try:
+                if node.tag == 'data' or node.tag == 'xpath':
+                    node = self.inherit_branding(node, view_id, xpath + node.tag + '/')
+                else:
+                    node.attrib.update({
+                        'data-oe-model': 'ir.ui.view',
+                        'data-oe-id': str(view_id),
+                        'data-oe-field': 'arch',
+                        'data-oe-xpath': xpath + node.tag + '/'
+                    })
+            except Exception,e:
+                print "inherit branding error",e,xpath,node.tag
+
         return specs_tree
 
     def apply_inheritance_specs(self, cr, uid, source, specs_tree, inherit_id, context=None):
diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py
index fa35476a5fe..8bd1371e8c5 100644
--- a/openerp/tools/qweb.py
+++ b/openerp/tools/qweb.py
@@ -2,7 +2,7 @@ import cgi
 import logging
 import types
 
-from openerp.tools.safe_eval import safe_eval as eval
+#from openerp.tools.safe_eval import safe_eval as eval
 
 import xml   # FIXME use lxml
 import xml.dom.minidom
@@ -16,7 +16,7 @@ class QWebEval(object):
     def __getitem__(self, expr):
         if expr in self.data:
             return self.data[expr]
-        r = None
+        r = ''
         try:
             r = eval(expr, self.data)
         except NameError:
@@ -262,7 +262,6 @@ class QWebXml(object):
             return ""
 
     def render_tag_call(self, e, t_att, g_att, v):
-        # TODO t-prefix
         if "import" in t_att:
             d = v
         else: