diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py
index 36ed62642..b5533a6ae 100644
--- a/src/yunohost/tools.py
+++ b/src/yunohost/tools.py
@@ -347,11 +347,8 @@ def tools_postinstall(operation_logger, domain, password, ignore_dyndns=False,
         '/home/yunohost.app'
     ]
 
-    for folder in folders_to_create:
-        try:
-            os.listdir(folder)
-        except OSError:
-            os.makedirs(folder)
+    for folder in filter(not os.path.exists, folders_to_create):
+        os.makedirs(folder)
 
     # Change folders permissions
     os.system('chmod 755 /home/yunohost.app')