diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py
index b1ecd78f74eaaf7cd0368b8d805cf5c90803c453..68254e7ddc025fee7268aa1c7a85a3b49c7286bb 100755
--- a/product/ERP5/Document/BusinessTemplate.py
+++ b/product/ERP5/Document/BusinessTemplate.py
@@ -1342,7 +1342,8 @@ class SitePropertyTemplateItem(BaseTemplateItem):
       if type in ('lines', 'tokens'):
         xml_data += os.linesep+'  <value>'
         for item in object:
-          xml_data += os.linesep+'   <item>%s</item>' %(item,)
+          if item != '':
+            xml_data += os.linesep+'   <item>%s</item>' %(item,)
         xml_data += os.linesep+'  </value>'
       else:
         xml_data += os.linesep+'  <value>%r</value>' %((os.linesep).join(object),)
@@ -2101,10 +2102,12 @@ Business Template is a set of definitions, such as skins, portal types and categ
                             'business_template_installation_workflow'] = None
 
     security.declareProtected(Permissions.ManagePortal, 'build')
-    def build(self):
+    def build(self, no_action=0):
       """
         Copy existing portal objects to self
       """
+      if no_action: return # this is use at import of Business Template to get the status built
+      
       # Make sure that everything is sane.
       self.clean()
 
diff --git a/product/ERP5/Tool/TemplateTool.py b/product/ERP5/Tool/TemplateTool.py
index 680db7ab0dd2939c3543a6f092e8fa2b9e0d9233..a71f0566180bf17cf10385c484794c4b895c2b47 100755
--- a/product/ERP5/Tool/TemplateTool.py
+++ b/product/ERP5/Tool/TemplateTool.py
@@ -249,6 +249,7 @@ class TemplateTool (BaseTool):
         tempid, temppath = mkstemp()      
         file, headers = urlretrieve(url, temppath)
         bt = self._importBT(temppath, id)
+      bt.build(no_action=1)
       bt.reindexObject()
 
       if REQUEST is not None:
@@ -277,7 +278,8 @@ class TemplateTool (BaseTool):
       tempfile.write(import_file.read())
       tempfile.close()
       
-      bt = self._importBT(temppath, id)      
+      bt = self._importBT(temppath, id)
+      bt.build(no_action=1)
       bt.reindexObject()
 
       if REQUEST is not None: