diff --git a/daemon/checkpoint.go b/daemon/checkpoint.go
index a4136d2c37..9b83f04444 100644
--- a/daemon/checkpoint.go
+++ b/daemon/checkpoint.go
@@ -67,7 +67,6 @@ func (daemon *Daemon) CheckpointCreate(name string, config types.CheckpointCreat
 	}
 
 	checkpointDir, err := getCheckpointDir(config.CheckpointDir, config.CheckpointID, name, container.ID, container.CheckpointDir(), true)
-
 	if err != nil {
 		return fmt.Errorf("cannot checkpoint container %s: %s", name, err)
 	}
@@ -105,6 +104,9 @@ func (daemon *Daemon) CheckpointList(name string, config types.CheckpointListOpt
 	}
 
 	checkpointDir, err := getCheckpointDir(config.CheckpointDir, "", name, container.ID, container.CheckpointDir(), true)
+	if err != nil {
+		return nil, err
+	}
 
 	if err := os.MkdirAll(checkpointDir, 0755); err != nil {
 		return nil, err