diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go
index 1523ac067c..d875be73b3 100644
--- a/daemon/container_operations_unix.go
+++ b/daemon/container_operations_unix.go
@@ -167,7 +167,9 @@ func (daemon *Daemon) setupSecretDir(c *container.Container, hasSecretDir *bool)
 	}
 
 	if !*hasSecretDir {
-		daemon.createSecretDir(c)
+		if err := daemon.createSecretDir(c); err != nil {
+			return err
+		}
 		*hasSecretDir = true
 	}
 
@@ -329,7 +331,9 @@ func (daemon *Daemon) setupConfigDir(c *container.Container, hasSecretDir *bool)
 			configRef.Sensitive = true
 			fPath, err = c.SensitiveConfigFilePath(*configRef.ConfigReference)
 			if !*hasSecretDir {
-				daemon.createSecretDir(c)
+				if err := daemon.createSecretDir(c); err != nil {
+					return err
+				}
 				*hasSecretDir = true
 			}
 		} else {