diff --git a/product/ERP5Type/Tool/ComponentTool.py b/product/ERP5Type/Tool/ComponentTool.py
index 813a9ebbab512f4dfb512a54264feb224b74eba9..5b8ec8c89c40babc7969db460c945ffea5656f50 100644
--- a/product/ERP5Type/Tool/ComponentTool.py
+++ b/product/ERP5Type/Tool/ComponentTool.py
@@ -99,7 +99,9 @@ class ComponentTool(BaseTool):
           getattr(erp5.portal_type,
                   content_portal_type).importAllFromFilesystem(self,
                                                                erase_existing=erase_existing))
-      except AttributeError:
+      # XXX-arnau: NotImplementedErrror only until everything has been
+      # implemented
+      except (NotImplementedError, AttributeError):
         LOG("ERP5Type.Tool.ComponentTool", WARNING, "Could not import %ss" % \
               content_portal_type)