@@ -863,6 +863,12 @@ func (cli *DockerCli) CmdInspect(args ...string) error {

 	for _, name := range cmd.Args() {

 		obj, _, err := readBody(cli.call("GET", "/containers/"+name+"/json", nil, false))

 		if err != nil {

+			if strings.Contains(err.Error(), "Too many") {

+				fmt.Fprintf(cli.err, "Error: %s", err.Error())

+				status = 1

+				continue

+			}

+

 			obj, _, err = readBody(cli.call("GET", "/images/"+name+"/json", nil, false))

 			if err != nil {

 				if strings.Contains(err.Error(), "No such") {

@@ -1114,7 +1114,7 @@ func postContainersCopy(eng *engine.Engine, version version.Version, w http.Resp

 	w.Header().Set("Content-Type", "application/x-tar")

 	if err := job.Run(); err != nil {

 		log.Errorf("%s", err.Error())

-		if strings.Contains(strings.ToLower(err.Error()), "no such container") {

+		if strings.Contains(strings.ToLower(err.Error()), "no such id") {

 			w.WriteHeader(http.StatusNotFound)

 		} else if strings.Contains(err.Error(), "no such file or directory") {

 			return fmt.Errorf("Could not find the file %s in container %s", origResource, vars["name"])

@@ -87,9 +87,9 @@ func (b *Builder) commit(id string, autoCmd []string, comment string) error {

 		}

 		defer container.Unmount()

 	}

-	container := b.Daemon.Get(id)

-	if container == nil {

-		return fmt.Errorf("An error occured while creating the container")

+	container, err := b.Daemon.Get(id)

+	if err != nil {

+		return err

 	}

 	// Note: Actually copy the struct

@@ -710,7 +710,11 @@ func fixPermissions(source, destination string, uid, gid int, destExisted bool)

 func (b *Builder) clearTmp() {

 	for c := range b.TmpContainers {

-		tmp := b.Daemon.Get(c)

+		tmp, err := b.Daemon.Get(c)

+		if err != nil {

+			fmt.Fprint(b.OutStream, err.Error())

+		}

+

 		if err := b.Daemon.Destroy(tmp); err != nil {

 			fmt.Fprintf(b.OutStream, "Error removing intermediate container %s: %s\n", utils.TruncateID(c), err.Error())

 			return

@@ -28,9 +28,9 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) engine.Status {

 		stderr = job.GetenvBool("stderr")

 	)

-	container := daemon.Get(name)

-	if container == nil {

-		return job.Errorf("No such container: %s", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

 	//logs

@@ -9,24 +9,29 @@ func (daemon *Daemon) ContainerChanges(job *engine.Job) engine.Status {

 		return job.Errorf("Usage: %s CONTAINER", job.Name)

 	}

 	name := job.Args[0]

-	if container := daemon.Get(name); container != nil {

-		outs := engine.NewTable("", 0)

-		changes, err := container.Changes()

-		if err != nil {

-			return job.Error(err)

-		}

-		for _, change := range changes {

-			out := &engine.Env{}

-			if err := out.Import(change); err != nil {

-				return job.Error(err)

-			}

-			outs.Add(out)

-		}

-		if _, err := outs.WriteListTo(job.Stdout); err != nil {

+

+	container, error := daemon.Get(name)

+	if error != nil {

+		return job.Error(error)

+	}

+

+	outs := engine.NewTable("", 0)

+	changes, err := container.Changes()

+	if err != nil {

+		return job.Error(err)

+	}

+

+	for _, change := range changes {

+		out := &engine.Env{}

+		if err := out.Import(change); err != nil {

 			return job.Error(err)

 		}

-	} else {

-		return job.Errorf("No such container: %s", name)

+		outs.Add(out)

 	}

+

+	if _, err := outs.WriteListTo(job.Stdout); err != nil {

+		return job.Error(err)

+	}

+

 	return engine.StatusOK

 }

@@ -12,9 +12,9 @@ func (daemon *Daemon) ContainerCommit(job *engine.Job) engine.Status {

 	}

 	name := job.Args[0]

-	container := daemon.Get(name)

-	if container == nil {

-		return job.Errorf("No such container: %s", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

 	var (

@@ -1126,7 +1126,12 @@ func (container *Container) updateParentsHosts() error {

 		if ref.ParentID == "0" {

 			continue

 		}

-		c := container.daemon.Get(ref.ParentID)

+

+		c, err := container.daemon.Get(ref.ParentID)

+		if err != nil {

+			log.Error(err)

+		}

+

 		if c != nil && !container.daemon.config.DisableNetwork && container.hostConfig.NetworkMode.IsPrivate() {

 			log.Debugf("Update /etc/hosts of %s for alias %s with ip %s", c.ID, ref.Name, container.NetworkSettings.IPAddress)

 			if err := etchosts.Update(c.HostsPath, container.NetworkSettings.IPAddress, ref.Name); err != nil {

@@ -1395,9 +1400,9 @@ func (container *Container) GetMountLabel() string {

 func (container *Container) getIpcContainer() (*Container, error) {

 	containerID := container.hostConfig.IpcMode.Container()

-	c := container.daemon.Get(containerID)

-	if c == nil {

-		return nil, fmt.Errorf("no such container to join IPC: %s", containerID)

+	c, err := container.daemon.Get(containerID)

+	if err != nil {

+		return nil, err

 	}

 	if !c.IsRunning() {

 		return nil, fmt.Errorf("cannot join IPC of a non running container: %s", containerID)

@@ -1412,9 +1417,9 @@ func (container *Container) getNetworkedContainer() (*Container, error) {

 		if len(parts) != 2 {

 			return nil, fmt.Errorf("no container specified to join network")

 		}

-		nc := container.daemon.Get(parts[1])

-		if nc == nil {

-			return nil, fmt.Errorf("no such container to join network: %s", parts[1])

+		nc, err := container.daemon.Get(parts[1])

+		if err != nil {

+			return nil, err

 		}

 		if !nc.IsRunning() {

 			return nil, fmt.Errorf("cannot join network of a non running container: %s", parts[1])

@@ -16,18 +16,19 @@ func (daemon *Daemon) ContainerCopy(job *engine.Job) engine.Status {

 		resource = job.Args[1]

 	)

-	if container := daemon.Get(name); container != nil {

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

+	}

-		data, err := container.Copy(resource)

-		if err != nil {

-			return job.Error(err)

-		}

-		defer data.Close()

+	data, err := container.Copy(resource)

+	if err != nil {

+		return job.Error(err)

+	}

+	defer data.Close()

-		if _, err := io.Copy(job.Stdout, data); err != nil {

-			return job.Error(err)

-		}

-		return engine.StatusOK

+	if _, err := io.Copy(job.Stdout, data); err != nil {

+		return job.Error(err)

 	}

-	return job.Errorf("No such container: %s", name)

+	return engine.StatusOK

 }

@@ -132,9 +132,9 @@ func (daemon *Daemon) GenerateSecurityOpt(ipcMode runconfig.IpcMode, pidMode run

 		return label.DisableSecOpt(), nil

 	}

 	if ipcContainer := ipcMode.Container(); ipcContainer != "" {

-		c := daemon.Get(ipcContainer)

-		if c == nil {

-			return nil, fmt.Errorf("no such container to join IPC: %s", ipcContainer)

+		c, err := daemon.Get(ipcContainer)

+		if err != nil {

+			return nil, err

 		}

 		if !c.IsRunning() {

 			return nil, fmt.Errorf("cannot join IPC of a non running container: %s", ipcContainer)

@@ -155,28 +155,39 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {

 	return nil

 }

-// Get looks for a container by the specified ID or name, and returns it.

-// If the container is not found, or if an error occurs, nil is returned.

-func (daemon *Daemon) Get(name string) *Container {

-	id, err := daemon.idIndex.Get(name)

-	if err == nil {

-		return daemon.containers.Get(id)

+// Get looks for a container with the provided prefix

+func (daemon *Daemon) Get(prefix string) (*Container, error) {

+	if containerByID := daemon.containers.Get(prefix); containerByID != nil {

+

+		// prefix is an exact match to a full container ID

+		return containerByID, nil

 	}

-	if c, _ := daemon.GetByName(name); c != nil {

-		return c

+	// Either GetByName finds an entity matching prefix exactly, or it doesn't.

+	// Check value of containerByName and ignore any errors

+	containerByName, _ := daemon.GetByName(prefix)

+	containerId, indexError := daemon.idIndex.Get(prefix)

+

+	if containerByName != nil {

+

+		// prefix is an exact match to a full container Name

+		return containerByName, nil

 	}

-	if err == truncindex.ErrDuplicateID {

-		log.Errorf("Short ID %s is ambiguous: please retry with more characters or use the full ID.\n", name)

+	if containerId != "" {

+

+		// prefix is a fuzzy match to a container ID

+		return daemon.containers.Get(containerId), nil

 	}

-	return nil

+

+	return nil, indexError

 }

 // Exists returns a true if a container of the specified ID or name exists,

 // false otherwise.

 func (daemon *Daemon) Exists(id string) bool {

-	return daemon.Get(id) != nil

+	c, _ := daemon.Get(id)

+	return c != nil

 }

 func (daemon *Daemon) containerRoot(id string) string {

@@ -715,9 +726,9 @@ func (daemon *Daemon) Children(name string) (map[string]*Container, error) {

 	children := make(map[string]*Container)

 	err = daemon.containerGraph.Walk(name, func(p string, e *graphdb.Entity) error {

-		c := daemon.Get(e.ID())

-		if c == nil {

-			return fmt.Errorf("Could not get container for name %s and id %s", e.ID(), p)

+		c, err := daemon.Get(e.ID())

+		if err != nil {

+			return err

 		}

 		children[p] = c

 		return nil

@@ -754,7 +765,10 @@ func (daemon *Daemon) RegisterLinks(container *Container, hostConfig *runconfig.

 			if err != nil {

 				return err

 			}

-			child := daemon.Get(parts["name"])

+			child, err := daemon.Get(parts["name"])

+			if err != nil {

+				return err

+			}

 			if child == nil {

 				return fmt.Errorf("Could not get container for %s", parts["name"])

 			}

@@ -1100,18 +1114,18 @@ func (daemon *Daemon) Stats(c *Container) (*execdriver.ResourceStats, error) {

 }

 func (daemon *Daemon) SubscribeToContainerStats(name string) (chan interface{}, error) {

-	c := daemon.Get(name)

-	if c == nil {

-		return nil, fmt.Errorf("no such container")

+	c, err := daemon.Get(name)

+	if err != nil {

+		return nil, err

 	}

 	ch := daemon.statsCollector.collect(c)

 	return ch, nil

 }

 func (daemon *Daemon) UnsubscribeToContainerStats(name string, ch chan interface{}) error {

-	c := daemon.Get(name)

-	if c == nil {

-		return fmt.Errorf("no such container")

+	c, err := daemon.Get(name)

+	if err != nil {

+		return err

 	}

 	daemon.statsCollector.unsubscribe(c, ch)

 	return nil

new file mode 100644

@@ -0,0 +1,101 @@

+package daemon

+

+import (

+	"github.com/docker/docker/pkg/graphdb"

+	"github.com/docker/docker/pkg/truncindex"

+	"os"

+	"path"

+	"testing"

+)

+

+//

+// https://github.com/docker/docker/issues/8069

+//

+

+func TestGet(t *testing.T) {

+	c1 := &Container{

+		ID:   "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",

+		Name: "tender_bardeen",

+	}

+	c2 := &Container{

+		ID:   "3cdbd1aa394fd68559fd1441d6eff2ab7c1e6363582c82febfaa8045df3bd8de",

+		Name: "drunk_hawking",

+	}

+	c3 := &Container{

+		ID:   "3cdbd1aa394fd68559fd1441d6eff2abfafdcba06e72d2febdba229008b0bf57",

+		Name: "3cdbd1aa",

+	}

+	c4 := &Container{

+		ID:   "75fb0b800922abdbef2d27e60abcdfaf7fb0698b2a96d22d3354da361a6ff4a5",

+		Name: "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",

+	}

+	c5 := &Container{

+		ID:   "d22d69a2b8960bf7fafdcba06e72d2febdba960bf7fafdcba06e72d2f9008b060b",

+		Name: "d22d69a2b896",

+	}

+

+	store := &contStore{

+		s: map[string]*Container{

+			c1.ID: c1,

+			c2.ID: c2,

+			c3.ID: c3,

+			c4.ID: c4,

+			c5.ID: c5,

+		},

+	}

+

+	index := truncindex.NewTruncIndex([]string{})

+	index.Add(c1.ID)

+	index.Add(c2.ID)

+	index.Add(c3.ID)

+	index.Add(c4.ID)

+	index.Add(c5.ID)

+

+	daemonTestDbPath := path.Join(os.TempDir(), "daemon_test.db")

+	graph, err := graphdb.NewSqliteConn(daemonTestDbPath)

+	if err != nil {

+		t.Fatalf("Failed to create daemon test sqlite database at %s", daemonTestDbPath)

+	}

+	graph.Set(c1.Name, c1.ID)

+	graph.Set(c2.Name, c2.ID)

+	graph.Set(c3.Name, c3.ID)

+	graph.Set(c4.Name, c4.ID)

+	graph.Set(c5.Name, c5.ID)

+

+	daemon := &Daemon{

+		containers:     store,

+		idIndex:        index,

+		containerGraph: graph,

+	}

+

+	if container, _ := daemon.Get("3cdbd1aa394fd68559fd1441d6eff2ab7c1e6363582c82febfaa8045df3bd8de"); container != c2 {

+		t.Fatal("Should explicitly match full container IDs")

+	}

+

+	if container, _ := daemon.Get("75fb0b8009"); container != c4 {

+		t.Fatal("Should match a partial ID")

+	}

+

+	if container, _ := daemon.Get("drunk_hawking"); container != c2 {

+		t.Fatal("Should match a full name")

+	}

+

+	// c3.Name is a partial match for both c3.ID and c2.ID

+	if c, _ := daemon.Get("3cdbd1aa"); c != c3 {

+		t.Fatal("Should match a full name even though it collides with another container's ID")

+	}

+

+	if container, _ := daemon.Get("d22d69a2b896"); container != c5 {

+		t.Fatal("Should match a container where the provided prefix is an exact match to the it's name, and is also a prefix for it's ID")

+	}

+

+	if _, err := daemon.Get("3cdbd1"); err == nil {

+		t.Fatal("Should return an error when provided a prefix that partially matches multiple container ID's")

+	}

+

+	if _, err := daemon.Get("nothing"); err == nil {

+		t.Fatal("Should return an error when provided a prefix that is neither a name or a partial match to an ID")

+	}

+

+	os.Remove(daemonTestDbPath)

+}

@@ -17,10 +17,10 @@ func (daemon *Daemon) ContainerRm(job *engine.Job) engine.Status {

 	removeVolume := job.GetenvBool("removeVolume")

 	removeLink := job.GetenvBool("removeLink")

 	forceRemove := job.GetenvBool("forceRemove")

-	container := daemon.Get(name)

-	if container == nil {

-		return job.Errorf("No such container: %s", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

 	if removeLink {

@@ -36,7 +36,7 @@ func (daemon *Daemon) ContainerRm(job *engine.Job) engine.Status {

 		if pe == nil {

 			return job.Errorf("Cannot get parent %s for name %s", parent, name)

 		}

-		parentContainer := daemon.Get(pe.ID())

+		parentContainer, _ := daemon.Get(pe.ID())

 		if parentContainer != nil {

 			parentContainer.DisableLink(n)

@@ -97,10 +97,9 @@ func (d *Daemon) unregisterExecCommand(execConfig *execConfig) {

 }

 func (d *Daemon) getActiveContainer(name string) (*Container, error) {

-	container := d.Get(name)

-

-	if container == nil {

-		return nil, fmt.Errorf("No such container: %s", name)

+	container, err := d.Get(name)

+	if err != nil {

+		return nil, err

 	}

 	if !container.IsRunning() {

@@ -11,20 +11,23 @@ func (daemon *Daemon) ContainerExport(job *engine.Job) engine.Status {

 		return job.Errorf("Usage: %s container_id", job.Name)

 	}

 	name := job.Args[0]

-	if container := daemon.Get(name); container != nil {

-		data, err := container.Export()

-		if err != nil {

-			return job.Errorf("%s: %s", name, err)

-		}

-		defer data.Close()

-		// Stream the entire contents of the container (basically a volatile snapshot)

-		if _, err := io.Copy(job.Stdout, data); err != nil {

-			return job.Errorf("%s: %s", name, err)

-		}

-		// FIXME: factor job-specific LogEvent to engine.Job.Run()

-		container.LogEvent("export")

-		return engine.StatusOK

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

-	return job.Errorf("No such container: %s", name)

+

+	data, err := container.Export()

+	if err != nil {

+		return job.Errorf("%s: %s", name, err)

+	}

+	defer data.Close()

+

+	// Stream the entire contents of the container (basically a volatile snapshot)

+	if _, err := io.Copy(job.Stdout, data); err != nil {

+		return job.Errorf("%s: %s", name, err)

+	}

+	// FIXME: factor job-specific LogEvent to engine.Job.Run()

+	container.LogEvent("export")

+	return engine.StatusOK

 }

@@ -13,60 +13,62 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {

 		return job.Errorf("usage: %s NAME", job.Name)

 	}

 	name := job.Args[0]

-	if container := daemon.Get(name); container != nil {

-		container.Lock()

-		defer container.Unlock()

-		if job.GetenvBool("raw") {

-			b, err := json.Marshal(&struct {

-				*Container

-				HostConfig *runconfig.HostConfig

-			}{container, container.hostConfig})

-			if err != nil {

-				return job.Error(err)

-			}

-			job.Stdout.Write(b)

-			return engine.StatusOK

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

+	}

+

+	container.Lock()

+	defer container.Unlock()

+	if job.GetenvBool("raw") {

+		b, err := json.Marshal(&struct {

+			*Container

+			HostConfig *runconfig.HostConfig

+		}{container, container.hostConfig})

+		if err != nil {

+			return job.Error(err)

 		}

+		job.Stdout.Write(b)

+		return engine.StatusOK

+	}

-		out := &engine.Env{}

-		out.SetJson("Id", container.ID)

-		out.SetAuto("Created", container.Created)

-		out.SetJson("Path", container.Path)

-		out.SetList("Args", container.Args)

-		out.SetJson("Config", container.Config)

-		out.SetJson("State", container.State)

-		out.Set("Image", container.ImageID)

-		out.SetJson("NetworkSettings", container.NetworkSettings)

-		out.Set("ResolvConfPath", container.ResolvConfPath)

-		out.Set("HostnamePath", container.HostnamePath)

-		out.Set("HostsPath", container.HostsPath)

-		out.SetJson("Name", container.Name)

-		out.SetInt("RestartCount", container.RestartCount)

-		out.Set("Driver", container.Driver)

-		out.Set("ExecDriver", container.ExecDriver)

-		out.Set("MountLabel", container.MountLabel)

-		out.Set("ProcessLabel", container.ProcessLabel)

-		out.SetJson("Volumes", container.Volumes)

-		out.SetJson("VolumesRW", container.VolumesRW)

-		out.SetJson("AppArmorProfile", container.AppArmorProfile)

+	out := &engine.Env{}

+	out.SetJson("Id", container.ID)

+	out.SetAuto("Created", container.Created)

+	out.SetJson("Path", container.Path)

+	out.SetList("Args", container.Args)

+	out.SetJson("Config", container.Config)

+	out.SetJson("State", container.State)

+	out.Set("Image", container.ImageID)

+	out.SetJson("NetworkSettings", container.NetworkSettings)

+	out.Set("ResolvConfPath", container.ResolvConfPath)

+	out.Set("HostnamePath", container.HostnamePath)

+	out.Set("HostsPath", container.HostsPath)

+	out.SetJson("Name", container.Name)

+	out.SetInt("RestartCount", container.RestartCount)

+	out.Set("Driver", container.Driver)

+	out.Set("ExecDriver", container.ExecDriver)

+	out.Set("MountLabel", container.MountLabel)

+	out.Set("ProcessLabel", container.ProcessLabel)

+	out.SetJson("Volumes", container.Volumes)

+	out.SetJson("VolumesRW", container.VolumesRW)

+	out.SetJson("AppArmorProfile", container.AppArmorProfile)

-		out.SetList("ExecIDs", container.GetExecIDs())

+	out.SetList("ExecIDs", container.GetExecIDs())

-		if children, err := daemon.Children(container.Name); err == nil {

-			for linkAlias, child := range children {

-				container.hostConfig.Links = append(container.hostConfig.Links, fmt.Sprintf("%s:%s", child.Name, linkAlias))

-			}

+	if children, err := daemon.Children(container.Name); err == nil {

+		for linkAlias, child := range children {

+			container.hostConfig.Links = append(container.hostConfig.Links, fmt.Sprintf("%s:%s", child.Name, linkAlias))

 		}

+	}

-		out.SetJson("HostConfig", container.hostConfig)

+	out.SetJson("HostConfig", container.hostConfig)

-		container.hostConfig.Links = nil

-		if _, err := out.WriteTo(job.Stdout); err != nil {

-			return job.Error(err)

-		}

-		return engine.StatusOK

+	container.hostConfig.Links = nil

+	if _, err := out.WriteTo(job.Stdout); err != nil {

+		return job.Error(err)

 	}

-	return job.Errorf("No such container: %s", name)

+	return engine.StatusOK

 }

 func (daemon *Daemon) ContainerExecInspect(job *engine.Job) engine.Status {

@@ -38,22 +38,23 @@ func (daemon *Daemon) ContainerKill(job *engine.Job) engine.Status {

 		}

 	}

-	if container := daemon.Get(name); container != nil {

-		// If no signal is passed, or SIGKILL, perform regular Kill (SIGKILL + wait())

-		if sig == 0 || syscall.Signal(sig) == syscall.SIGKILL {

-			if err := container.Kill(); err != nil {

-				return job.Errorf("Cannot kill container %s: %s", name, err)

-			}

-			container.LogEvent("kill")

-		} else {

-			// Otherwise, just send the requested signal

-			if err := container.KillSig(int(sig)); err != nil {

-				return job.Errorf("Cannot kill container %s: %s", name, err)

-			}

-			// FIXME: Add event for signals

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

+	}

+

+	// If no signal is passed, or SIGKILL, perform regular Kill (SIGKILL + wait())

+	if sig == 0 || syscall.Signal(sig) == syscall.SIGKILL {

+		if err := container.Kill(); err != nil {

+			return job.Errorf("Cannot kill container %s: %s", name, err)

 		}

+		container.LogEvent("kill")

 	} else {

-		return job.Errorf("No such container: %s", name)

+		// Otherwise, just send the requested signal

+		if err := container.KillSig(int(sig)); err != nil {

+			return job.Errorf("Cannot kill container %s: %s", name, err)

+		}

+		// FIXME: Add event for signals

 	}

 	return engine.StatusOK

 }

@@ -63,16 +63,16 @@ func (daemon *Daemon) Containers(job *engine.Job) engine.Status {

 	var beforeCont, sinceCont *Container

 	if before != "" {

-		beforeCont = daemon.Get(before)

-		if beforeCont == nil {

-			return job.Error(fmt.Errorf("Could not find container with name or id %s", before))

+		beforeCont, err = daemon.Get(before)

+		if err != nil {

+			return job.Error(err)

 		}

 	}

 	if since != "" {

-		sinceCont = daemon.Get(since)

-		if sinceCont == nil {

-			return job.Error(fmt.Errorf("Could not find container with name or id %s", since))

+		sinceCont, err = daemon.Get(since)

+		if err != nil {

+			return job.Error(err)

 		}

 	}

@@ -40,9 +40,9 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {

 	if tail == "" {

 		tail = "all"

 	}

-	container := daemon.Get(name)

-	if container == nil {

-		return job.Errorf("No such container: %s", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

 	cLog, err := container.ReadLog("json")

 	if err != nil && os.IsNotExist(err) {

@@ -9,9 +9,9 @@ func (daemon *Daemon) ContainerPause(job *engine.Job) engine.Status {

 		return job.Errorf("Usage: %s CONTAINER", job.Name)

 	}

 	name := job.Args[0]

-	container := daemon.Get(name)

-	if container == nil {

-		return job.Errorf("No such container: %s", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

 	if err := container.Pause(); err != nil {

 		return job.Errorf("Cannot pause container %s: %s", name, err)

@@ -25,9 +25,9 @@ func (daemon *Daemon) ContainerUnpause(job *engine.Job) engine.Status {

 		return job.Errorf("Usage: %s CONTAINER", job.Name)

 	}

 	name := job.Args[0]

-	container := daemon.Get(name)

-	if container == nil {

-		return job.Errorf("No such container: %s", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

 	if err := container.Unpause(); err != nil {

 		return job.Errorf("Cannot unpause container %s: %s", name, err)

@@ -11,9 +11,9 @@ func (daemon *Daemon) ContainerRename(job *engine.Job) engine.Status {

 	oldName := job.Args[0]

 	newName := job.Args[1]

-	container := daemon.Get(oldName)

-	if container == nil {

-		return job.Errorf("No such container: %s", oldName)

+	container, err := daemon.Get(oldName)

+	if err != nil {

+		return job.Error(err)

 	}

 	oldName = container.Name

@@ -19,14 +19,14 @@ func (daemon *Daemon) ContainerResize(job *engine.Job) engine.Status {

 	if err != nil {

 		return job.Error(err)

 	}

-

-	if container := daemon.Get(name); container != nil {

-		if err := container.Resize(height, width); err != nil {

-			return job.Error(err)

-		}

-		return engine.StatusOK

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

-	return job.Errorf("No such container: %s", name)

+	if err := container.Resize(height, width); err != nil {

+		return job.Error(err)

+	}

+	return engine.StatusOK

 }

 func (daemon *Daemon) ContainerExecResize(job *engine.Job) engine.Status {

@@ -15,13 +15,13 @@ func (daemon *Daemon) ContainerRestart(job *engine.Job) engine.Status {

 	if job.EnvExists("t") {

 		t = job.GetenvInt("t")

 	}

-	if container := daemon.Get(name); container != nil {

-		if err := container.Restart(int(t)); err != nil {

-			return job.Errorf("Cannot restart container %s: %s\n", name, err)

-		}

-		container.LogEvent("restart")

-	} else {

-		return job.Errorf("No such container: %s\n", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

+	if err := container.Restart(int(t)); err != nil {

+		return job.Errorf("Cannot restart container %s: %s\n", name, err)

+	}

+	container.LogEvent("restart")

 	return engine.StatusOK

 }

@@ -14,12 +14,12 @@ func (daemon *Daemon) ContainerStart(job *engine.Job) engine.Status {

 		return job.Errorf("Usage: %s container_id", job.Name)

 	}

 	var (

-		name      = job.Args[0]

-		container = daemon.Get(name)

+		name = job.Args[0]

 	)

-	if container == nil {

-		return job.Errorf("No such container: %s", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

 	if container.IsPaused() {

@@ -15,16 +15,16 @@ func (daemon *Daemon) ContainerStop(job *engine.Job) engine.Status {

 	if job.EnvExists("t") {

 		t = job.GetenvInt("t")

 	}

-	if container := daemon.Get(name); container != nil {

-		if !container.IsRunning() {

-			return job.Errorf("Container already stopped")

-		}

-		if err := container.Stop(int(t)); err != nil {

-			return job.Errorf("Cannot stop container %s: %s\n", name, err)

-		}

-		container.LogEvent("stop")

-	} else {

-		return job.Errorf("No such container: %s\n", name)

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

 	}

+	if !container.IsRunning() {

+		return job.Errorf("Container already stopped")

+	}

+	if err := container.Stop(int(t)); err != nil {

+		return job.Errorf("Cannot stop container %s: %s\n", name, err)

+	}

+	container.LogEvent("stop")

 	return engine.StatusOK

 }

@@ -21,59 +21,59 @@ func (daemon *Daemon) ContainerTop(job *engine.Job) engine.Status {

 		psArgs = job.Args[1]

 	}

-	if container := daemon.Get(name); container != nil {

-		if !container.IsRunning() {

-			return job.Errorf("Container %s is not running", name)

-		}

-		pids, err := daemon.ExecutionDriver().GetPidsForContainer(container.ID)

-		if err != nil {

-			return job.Error(err)

-		}

-		output, err := exec.Command("ps", strings.Split(psArgs, " ")...).Output()

-		if err != nil {

-			return job.Errorf("Error running ps: %s", err)

-		}

+	container, err := daemon.Get(name)

+	if err != nil {

+		return job.Error(err)

+	}

+	if !container.IsRunning() {

+		return job.Errorf("Container %s is not running", name)

+	}

+	pids, err := daemon.ExecutionDriver().GetPidsForContainer(container.ID)

+	if err != nil {

+		return job.Error(err)

+	}

+	output, err := exec.Command("ps", strings.Split(psArgs, " ")...).Output()

+	if err != nil {

+		return job.Errorf("Error running ps: %s", err)

+	}

-		lines := strings.Split(string(output), "\n")

-		header := strings.Fields(lines[0])

-		out := &engine.Env{}

-		out.SetList("Titles", header)

+	lines := strings.Split(string(output), "\n")

+	header := strings.Fields(lines[0])

+	out := &engine.Env{}

+	out.SetList("Titles", header)

-		pidIndex := -1

-		for i, name := range header {

-			if name == "PID" {

-				pidIndex = i

-			}

-		}

-		if pidIndex == -1 {

-			return job.Errorf("Couldn't find PID field in ps output")

+	pidIndex := -1

+	for i, name := range header {

+		if name == "PID" {

+			pidIndex = i