diff --git a/src/core/namespace.c b/src/core/namespace.c
index f86092f6b1b..c2215090a9d 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -263,11 +263,8 @@ fail:
         if (devmqueue)
                 umount(devmqueue);
 
-        if (dev) {
-                umount(dev);
-                rmdir(dev);
-        }
-
+        umount(dev);
+        rmdir(dev);
         rmdir(temporary_mount);
 
         return r;