diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index eab23f64..00255d39 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -367,7 +367,7 @@ do_noncefile_create (DBusNonceFile *noncefile,
 
     return TRUE;
   on_error:
-    if (use_subdir)
+    if (use_subdir && _dbus_string_get_length (&noncefile->dir) != 0)
       _dbus_delete_directory (&noncefile->dir, NULL);
     _dbus_string_free (&noncefile->dir);
     _dbus_string_free (&noncefile->path);