@@ -95,12 +95,12 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo

 	for _, v := range hostConfig.VolumesFrom {

 		containerID, mode, err := parser.ParseVolumesFrom(v)

 		if err != nil {

-			return err

+			return errdefs.InvalidParameter(err)

 		}

 		c, err := daemon.GetContainer(containerID)

 		if err != nil {

-			return err

+			return errdefs.InvalidParameter(err)

 		}

 		for _, m := range c.MountPoints {

@@ -621,3 +621,18 @@ func TestCreateDifferentPlatform(t *testing.T) {

 		assert.Assert(t, client.IsErrNotFound(err), err)

 	})

 }

+

+func TestCreateVolumesFromNonExistingContainer(t *testing.T) {

+	defer setupTest(t)()

+	cli := testEnv.APIClient()

+

+	_, err := cli.ContainerCreate(

+		context.Background(),

+		&container.Config{Image: "busybox"},

+		&container.HostConfig{VolumesFrom: []string{"nosuchcontainer"}},

+		nil,

+		nil,

+		"",

+	)

+	assert.Check(t, errdefs.IsInvalidParameter(err))

+}