diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index bcb86d589d2..17c3dfb66d9 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -65,14 +65,14 @@ 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 
+            return False # TODO: check why not display root dir 
             if not mid:
-                return None
+                return False
         except Exception, e:
             import netsvc
             logger = netsvc.Logger()
             logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
-            return None
+            return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
     def _get_def_storage(self,cr,uid,context=None):
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index bd61c65e16b..1f639a32fa3 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -23,7 +23,7 @@ import StringIO
 import odt2txt
 
 from content_index import indexer, cntIndex
-
+from subprocess import Popen, PIPE
 
 def _to_unicode(s):
     try: