diff --git a/drivers/aufs/aufs.go b/drivers/aufs/aufs.go
index 8d001a89ee..56f48ad205 100644
--- a/drivers/aufs/aufs.go
+++ b/drivers/aufs/aufs.go
@@ -679,10 +679,13 @@ func (a *Driver) Cleanup() error {
 }
 
 func (a *Driver) aufsMount(ro []string, rw, target string, options graphdriver.MountOpts) (err error) {
-	defer func() {
+	defer func() error {
 		if err != nil {
-			Unmount(target)
+			if err1 := Unmount(target); err1 != nil {
+				logrus.Warnf("Unmount %s: %v", target, err1)
+			}
 		}
+		return err
 	}()
 
 	// Mount options are clipped to page size(4096 bytes). If there are more