diff --git a/product/ERP5Type/Core/Folder.py b/product/ERP5Type/Core/Folder.py
index f0e9b3a1ff999553d53aafeb852baa4f9b2b3118..0d39bf013a1a714c69ff9e9af8cf9fcd3f02d3b1 100644
--- a/product/ERP5Type/Core/Folder.py
+++ b/product/ERP5Type/Core/Folder.py
@@ -47,10 +47,14 @@ try:
 except ImportError:
   from Products.BTreeFolder2.CMFBTreeFolder import CMFBTreeFolder
 
-from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
+try:
+  from Products.HBTreeFolder2.CMFHBTreeFolder import CMFHBTreeFolder
+except ImportError:
+  class CMFHBTreeFolder:
+
+    def __init__(self, *args, **kw):
+      raise ValueError, 'You must install the HBTreeFolder2 Product'
 
-from Products.HBTreeFolder2.CMFHBTreeFolder import CMFHBTreeFolder
-from Products.HBTreeFolder2.HBTreeFolder2 import HBTreeFolder2Base
 
 from AccessControl import getSecurityManager
 from Products.ERP5Type import Permissions