diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index ad13ad925e1..bcb86d589d2 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -65,6 +65,7 @@ class document_directory(osv.osv):
         objid=self.pool.get('ir.model.data')
         try:
             mid = objid._get_id(cr, uid, 'document', 'dir_root')
+            return None # TODO: check why not display root dir 
             if not mid:
                 return None
         except Exception, e:
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index e9abe8734a8..6181b5678e8 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -184,13 +184,14 @@ class node_dir(node_class):
         dc2.update(self.dctx)
         dc2['dir_id'] = self.dir_id
         self.displayname = dirr.name
-        for dfld in dirr.dctx_ids:
-            try:
-                self.dctx['dctx_' + dfld.field] = safe_eval(dfld.expr,dc2)
-            except Exception,e:
-                print "Cannot eval %s" % dfld.expr
-                print e
-                pass
+        if dirr.dctx_ids:
+            for dfld in dirr.dctx_ids:
+                try:
+                    self.dctx['dctx_' + dfld.field] = safe_eval(dfld.expr,dc2)
+                except Exception,e:
+                    print "Cannot eval %s" % dfld.expr
+                    print e
+                    pass
 
     def children(self,cr):
         return self._child_get(cr) + self._file_get(cr)