diff --git a/src/enchive.c b/src/enchive.c
index 5d2e834..3c36878 100644
--- a/src/enchive.c
+++ b/src/enchive.c
@@ -369,15 +369,8 @@ storage_directory(char *file)
     s = strchr(path + 1, '/');
     while (s) {
         *s = 0;
-        if (dir_exists(path) || !mkdir(path, 0700)) {
-            DIR *dir = opendir(path);
-            if (dir)
-                closedir(dir);
-            else
-                fatal("opendir(%s) -- %s", path, strerror(errno));
-        } else {
+        if (mkdir(path, 0700) && !dir_exists(path))
             fatal("mkdir(%s) -- %s", path, strerror(errno));
-        }
         *s = '/';
         s = strchr(s + 1, '/');
     }