diff --git a/product/ERP5Subversion/SubversionClient.py b/product/ERP5Subversion/SubversionClient.py
index 374e834b3036f76dc62953cc078b9dbdec5b2e1d..7fc09ceaf74e79c2d62d3cf3559166e6fe668b4b 100644
--- a/product/ERP5Subversion/SubversionClient.py
+++ b/product/ERP5Subversion/SubversionClient.py
@@ -294,7 +294,7 @@ try:
       return log_list
         
     def add(self, path):
-      return self.client.add(path=path, force=True)
+      self.client.add(path=path, force=True)
 
     def resolved(self, path):
       return self.client.resolved(path=path)
@@ -339,7 +339,7 @@ try:
       return self.client.cleanup(path=path)
 
     def remove(self, path):
-      return self.client.remove(url_or_path=path, force=True)
+      self.client.remove(url_or_path=path, force=True)
 
   def newSubversionClient(container, **kw):
     return SubversionClient(container, **kw).__of__(container)
diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py
index 9b4deec45406533d7403dc78ec5c842b6b75d3be..a4b13bedee9f7b0df059f149ad0c241ce5d7a237 100644
--- a/product/ERP5Subversion/Tool/SubversionTool.py
+++ b/product/ERP5Subversion/Tool/SubversionTool.py
@@ -727,6 +727,8 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
     """Update a working copy.
     """
     path = self._getWorkingPath(self.getSubversionPath(business_template))
+    # First remove unversioned in working copy that could conflict
+    self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
     client = self._getClient()
     # Revert local changes in working copy first 
     # to import a "pure" BT after update
@@ -741,6 +743,8 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
     """Update a working copy.
     """
     path = self._getWorkingPath(self.getSubversionPath(business_template))
+    # First remove unversioned in working copy that could conflict
+    self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
     client = self._getClient()
     # Update from SVN
     client.update(path)