@@ -1097,7 +1097,7 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite

 			select {

 			case <-finished:

 			case <-closeNotifier.CloseNotify():

-				log.Infof("Client disconnected, cancelling job: %v", job)

+				log.Infof("Client disconnected, cancelling job: %s", job.Name)

 				job.Cancel()

 			}

 		}()

@@ -1581,9 +1581,9 @@ type Server interface {

 // ServeApi loops through all of the protocols sent in to docker and spawns

 // off a go routine to setup a serving http.Server for each.

-func ServeApi(job *engine.Job) engine.Status {

+func ServeApi(job *engine.Job) error {

 	if len(job.Args) == 0 {

-		return job.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)

+		return fmt.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)

 	}

 	var (

 		protoAddrs = job.Args

@@ -1594,7 +1594,7 @@ func ServeApi(job *engine.Job) engine.Status {

 	for _, protoAddr := range protoAddrs {

 		protoAddrParts := strings.SplitN(protoAddr, "://", 2)

 		if len(protoAddrParts) != 2 {

-			return job.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)

+			return fmt.Errorf("usage: %s PROTO://ADDR [PROTO://ADDR ...]", job.Name)

 		}

 		go func() {

 			log.Infof("Listening for HTTP on %s (%s)", protoAddrParts[0], protoAddrParts[1])

@@ -1618,9 +1618,9 @@ func ServeApi(job *engine.Job) engine.Status {

 	for i := 0; i < len(protoAddrs); i++ {

 		err := <-chErrors

 		if err != nil {

-			return job.Error(err)

+			return err

 		}

 	}

-	return engine.StatusOK

+	return nil

 }

@@ -90,7 +90,7 @@ func serveFd(addr string, job *engine.Job) error {

 }

 // Called through eng.Job("acceptconnections")

-func AcceptConnections(job *engine.Job) engine.Status {

+func AcceptConnections(job *engine.Job) error {

 	// Tell the init daemon we are accepting requests

 	go systemd.SdNotify("READY=1")

@@ -99,5 +99,5 @@ func AcceptConnections(job *engine.Job) engine.Status {

 		close(activationLock)

 	}

-	return engine.StatusOK

+	return nil

 }

@@ -63,7 +63,7 @@ func TesthttpError(t *testing.T) {

 func TestGetVersion(t *testing.T) {

 	eng := engine.New()

 	var called bool

-	eng.Register("version", func(job *engine.Job) engine.Status {

+	eng.Register("version", func(job *engine.Job) error {

 		called = true

 		v := &engine.Env{}

 		v.SetJson("Version", "42.1")

@@ -72,9 +72,9 @@ func TestGetVersion(t *testing.T) {

 		v.Set("Os", "Linux")

 		v.Set("Arch", "x86_64")

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/version", nil, eng, t)

 	if !called {

@@ -92,15 +92,15 @@ func TestGetVersion(t *testing.T) {

 func TestGetInfo(t *testing.T) {

 	eng := engine.New()

 	var called bool

-	eng.Register("info", func(job *engine.Job) engine.Status {

+	eng.Register("info", func(job *engine.Job) error {

 		called = true

 		v := &engine.Env{}

 		v.SetInt("Containers", 1)

 		v.SetInt("Images", 42000)

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/info", nil, eng, t)

 	if !called {

@@ -119,13 +119,13 @@ func TestGetInfo(t *testing.T) {

 func TestGetImagesJSON(t *testing.T) {

 	eng := engine.New()

 	var called bool

-	eng.Register("images", func(job *engine.Job) engine.Status {

+	eng.Register("images", func(job *engine.Job) error {

 		called = true

 		v := createEnvFromGetImagesJSONStruct(sampleImage)

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/images/json", nil, eng, t)

 	if !called {

@@ -145,9 +145,9 @@ func TestGetImagesJSON(t *testing.T) {

 func TestGetImagesJSONFilter(t *testing.T) {

 	eng := engine.New()

 	filter := "nothing"

-	eng.Register("images", func(job *engine.Job) engine.Status {

+	eng.Register("images", func(job *engine.Job) error {

 		filter = job.Getenv("filter")

-		return engine.StatusOK

+		return nil

 	})

 	serveRequest("GET", "/images/json?filter=aaaa", nil, eng, t)

 	if filter != "aaaa" {

@@ -158,9 +158,9 @@ func TestGetImagesJSONFilter(t *testing.T) {

 func TestGetImagesJSONFilters(t *testing.T) {

 	eng := engine.New()

 	filter := "nothing"

-	eng.Register("images", func(job *engine.Job) engine.Status {

+	eng.Register("images", func(job *engine.Job) error {

 		filter = job.Getenv("filters")

-		return engine.StatusOK

+		return nil

 	})

 	serveRequest("GET", "/images/json?filters=nnnn", nil, eng, t)

 	if filter != "nnnn" {

@@ -171,9 +171,9 @@ func TestGetImagesJSONFilters(t *testing.T) {

 func TestGetImagesJSONAll(t *testing.T) {

 	eng := engine.New()

 	allFilter := "-1"

-	eng.Register("images", func(job *engine.Job) engine.Status {

+	eng.Register("images", func(job *engine.Job) error {

 		allFilter = job.Getenv("all")

-		return engine.StatusOK

+		return nil

 	})

 	serveRequest("GET", "/images/json?all=1", nil, eng, t)

 	if allFilter != "1" {

@@ -184,14 +184,14 @@ func TestGetImagesJSONAll(t *testing.T) {

 func TestGetImagesJSONLegacyFormat(t *testing.T) {

 	eng := engine.New()

 	var called bool

-	eng.Register("images", func(job *engine.Job) engine.Status {

+	eng.Register("images", func(job *engine.Job) error {

 		called = true

 		outsLegacy := engine.NewTable("Created", 0)

 		outsLegacy.Add(createEnvFromGetImagesJSONStruct(sampleImage))

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequestUsingVersion("GET", "/images/json", "1.6", nil, eng, t)

 	if !called {

@@ -219,7 +219,7 @@ func TestGetContainersByName(t *testing.T) {

 	eng := engine.New()

 	name := "container_name"

 	var called bool

-	eng.Register("container_inspect", func(job *engine.Job) engine.Status {

+	eng.Register("container_inspect", func(job *engine.Job) error {

 		called = true

 		if job.Args[0] != name {

 			t.Errorf("name != '%s': %#v", name, job.Args[0])

@@ -232,9 +232,9 @@ func TestGetContainersByName(t *testing.T) {

 		v := &engine.Env{}

 		v.SetBool("dirty", true)

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/containers/"+name+"/json", nil, eng, t)

 	if !called {

@@ -253,7 +253,7 @@ func TestGetContainersByName(t *testing.T) {

 func TestGetEvents(t *testing.T) {

 	eng := engine.New()

 	var called bool

-	eng.Register("events", func(job *engine.Job) engine.Status {

+	eng.Register("events", func(job *engine.Job) error {

 		called = true

 		since := job.Getenv("since")

 		if since != "1" {

@@ -267,9 +267,9 @@ func TestGetEvents(t *testing.T) {

 		v.Set("since", since)

 		v.Set("until", until)

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/events?since=1&until=0", nil, eng, t)

 	if !called {

@@ -295,7 +295,7 @@ func TestLogs(t *testing.T) {

 	eng := engine.New()

 	var inspect bool

 	var logs bool

-	eng.Register("container_inspect", func(job *engine.Job) engine.Status {

+	eng.Register("container_inspect", func(job *engine.Job) error {

 		inspect = true

 		if len(job.Args) == 0 {

 			t.Fatal("Job arguments is empty")

@@ -303,10 +303,10 @@ func TestLogs(t *testing.T) {

 		if job.Args[0] != "test" {

 			t.Fatalf("Container name %s, must be test", job.Args[0])

 		}

-		return engine.StatusOK

+		return nil

 	})

 	expected := "logs"

-	eng.Register("logs", func(job *engine.Job) engine.Status {

+	eng.Register("logs", func(job *engine.Job) error {

 		logs = true

 		if len(job.Args) == 0 {

 			t.Fatal("Job arguments is empty")

@@ -331,7 +331,7 @@ func TestLogs(t *testing.T) {

 			t.Fatalf("timestamps %s, must be 1", timestamps)

 		}

 		job.Stdout.Write([]byte(expected))

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/containers/test/logs?follow=1&stdout=1&timestamps=1", nil, eng, t)

 	if r.Code != http.StatusOK {

@@ -353,7 +353,7 @@ func TestLogsNoStreams(t *testing.T) {

 	eng := engine.New()

 	var inspect bool

 	var logs bool

-	eng.Register("container_inspect", func(job *engine.Job) engine.Status {

+	eng.Register("container_inspect", func(job *engine.Job) error {

 		inspect = true

 		if len(job.Args) == 0 {

 			t.Fatal("Job arguments is empty")

@@ -361,11 +361,11 @@ func TestLogsNoStreams(t *testing.T) {

 		if job.Args[0] != "test" {

 			t.Fatalf("Container name %s, must be test", job.Args[0])

 		}

-		return engine.StatusOK

+		return nil

 	})

-	eng.Register("logs", func(job *engine.Job) engine.Status {

+	eng.Register("logs", func(job *engine.Job) error {

 		logs = true

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/containers/test/logs", nil, eng, t)

 	if r.Code != http.StatusBadRequest {

@@ -388,7 +388,7 @@ func TestGetImagesHistory(t *testing.T) {

 	eng := engine.New()

 	imageName := "docker-test-image"

 	var called bool

-	eng.Register("history", func(job *engine.Job) engine.Status {

+	eng.Register("history", func(job *engine.Job) error {

 		called = true

 		if len(job.Args) == 0 {

 			t.Fatal("Job arguments is empty")

@@ -398,9 +398,9 @@ func TestGetImagesHistory(t *testing.T) {

 		}

 		v := &engine.Env{}

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/images/"+imageName+"/history", nil, eng, t)

 	if !called {

@@ -418,7 +418,7 @@ func TestGetImagesByName(t *testing.T) {

 	eng := engine.New()

 	name := "image_name"

 	var called bool

-	eng.Register("image_inspect", func(job *engine.Job) engine.Status {

+	eng.Register("image_inspect", func(job *engine.Job) error {

 		called = true

 		if job.Args[0] != name {

 			t.Fatalf("name != '%s': %#v", name, job.Args[0])

@@ -431,9 +431,9 @@ func TestGetImagesByName(t *testing.T) {

 		v := &engine.Env{}

 		v.SetBool("dirty", true)

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

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("GET", "/images/"+name+"/json", nil, eng, t)

 	if !called {

@@ -455,7 +455,7 @@ func TestDeleteContainers(t *testing.T) {

 	eng := engine.New()

 	name := "foo"

 	var called bool

-	eng.Register("rm", func(job *engine.Job) engine.Status {

+	eng.Register("rm", func(job *engine.Job) error {

 		called = true

 		if len(job.Args) == 0 {

 			t.Fatalf("Job arguments is empty")

@@ -463,7 +463,7 @@ func TestDeleteContainers(t *testing.T) {

 		if job.Args[0] != name {

 			t.Fatalf("name != '%s': %#v", name, job.Args[0])

 		}

-		return engine.StatusOK

+		return nil

 	})

 	r := serveRequest("DELETE", "/containers/"+name, nil, eng, t)

 	if !called {

@@ -3,6 +3,7 @@ package builder

 import (

 	"bytes"

 	"encoding/json"

+	"fmt"

 	"io"

 	"io/ioutil"

 	"os"

@@ -44,9 +45,9 @@ func (b *BuilderJob) Install() {

 	b.Engine.Register("build_config", b.CmdBuildConfig)

 }

-func (b *BuilderJob) CmdBuild(job *engine.Job) engine.Status {

+func (b *BuilderJob) CmdBuild(job *engine.Job) error {

 	if len(job.Args) != 0 {

-		return job.Errorf("Usage: %s\n", job.Name)

+		return fmt.Errorf("Usage: %s\n", job.Name)

 	}

 	var (

 		dockerfileName = job.Getenv("dockerfile")

@@ -73,11 +74,11 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) engine.Status {

 	repoName, tag = parsers.ParseRepositoryTag(repoName)

 	if repoName != "" {

 		if err := registry.ValidateRepositoryName(repoName); err != nil {

-			return job.Error(err)

+			return err

 		}

 		if len(tag) > 0 {

 			if err := graph.ValidateTagName(tag); err != nil {

-				return job.Error(err)

+				return err

 			}

 		}

 	}

@@ -90,28 +91,28 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) engine.Status {

 		}

 		root, err := ioutil.TempDir("", "docker-build-git")

 		if err != nil {

-			return job.Error(err)

+			return err

 		}

 		defer os.RemoveAll(root)

 		if output, err := exec.Command("git", "clone", "--recursive", remoteURL, root).CombinedOutput(); err != nil {

-			return job.Errorf("Error trying to use git: %s (%s)", err, output)

+			return fmt.Errorf("Error trying to use git: %s (%s)", err, output)

 		}

 		c, err := archive.Tar(root, archive.Uncompressed)

 		if err != nil {

-			return job.Error(err)

+			return err

 		}

 		context = c

 	} else if urlutil.IsURL(remoteURL) {

 		f, err := utils.Download(remoteURL)

 		if err != nil {

-			return job.Error(err)

+			return err

 		}

 		defer f.Body.Close()

 		dockerFile, err := ioutil.ReadAll(f.Body)

 		if err != nil {

-			return job.Error(err)

+			return err

 		}

 		// When we're downloading just a Dockerfile put it in

@@ -120,7 +121,7 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) engine.Status {

 		c, err := archive.Generate(dockerfileName, string(dockerFile))

 		if err != nil {

-			return job.Error(err)

+			return err

 		}

 		context = c

 	}

@@ -158,18 +159,18 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) engine.Status {

 	id, err := builder.Run(context)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	if repoName != "" {

 		b.Daemon.Repositories().Set(repoName, tag, id, true)

 	}

-	return engine.StatusOK

+	return nil

 }

-func (b *BuilderJob) CmdBuildConfig(job *engine.Job) engine.Status {

+func (b *BuilderJob) CmdBuildConfig(job *engine.Job) error {

 	if len(job.Args) != 0 {

-		return job.Errorf("Usage: %s\n", job.Name)

+		return fmt.Errorf("Usage: %s\n", job.Name)

 	}

 	var (

@@ -178,18 +179,18 @@ func (b *BuilderJob) CmdBuildConfig(job *engine.Job) engine.Status {

 	)

 	if err := job.GetenvJson("config", &newConfig); err != nil {

-		return job.Error(err)

+		return err

 	}

 	ast, err := parser.Parse(bytes.NewBufferString(strings.Join(changes, "\n")))

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	// ensure that the commands are valid

 	for _, n := range ast.Children {

 		if !validCommitCommands[n.Value] {

-			return job.Errorf("%s is not a valid change command", n.Value)

+			return fmt.Errorf("%s is not a valid change command", n.Value)

 		}

 	}

@@ -204,12 +205,12 @@ func (b *BuilderJob) CmdBuildConfig(job *engine.Job) engine.Status {

 	for i, n := range ast.Children {

 		if err := builder.dispatch(i, n); err != nil {

-			return job.Error(err)

+			return err

 		}

 	}

 	if err := json.NewEncoder(job.Stdout).Encode(builder.Config); err != nil {

-		return job.Error(err)

+		return err

 	}

-	return engine.StatusOK

+	return nil

 }

@@ -57,7 +57,7 @@ func daemon(eng *engine.Engine) error {

 }

 // builtins jobs independent of any subsystem

-func dockerVersion(job *engine.Job) engine.Status {

+func dockerVersion(job *engine.Job) error {

 	v := &engine.Env{}

 	v.SetJson("Version", dockerversion.VERSION)

 	v.SetJson("ApiVersion", api.APIVERSION)

@@ -69,7 +69,7 @@ func dockerVersion(job *engine.Job) engine.Status {

 		v.Set("KernelVersion", kernelVersion.String())

 	}

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

-		return job.Error(err)

+		return err

 	}

-	return engine.StatusOK

+	return nil

 }

@@ -2,6 +2,7 @@ package daemon

 import (

 	"encoding/json"

+	"fmt"

 	"io"

 	"os"

 	"sync"

@@ -14,9 +15,9 @@ import (

 	"github.com/docker/docker/utils"

 )

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

+func (daemon *Daemon) ContainerAttach(job *engine.Job) error {

 	if len(job.Args) != 1 {

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

+		return fmt.Errorf("Usage: %s CONTAINER\n", job.Name)

 	}

 	var (

@@ -30,7 +31,7 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) engine.Status {

 	container, err := daemon.Get(name)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	//logs

@@ -108,7 +109,7 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) engine.Status {

 			container.WaitStop(-1 * time.Second)

 		}

 	}

-	return engine.StatusOK

+	return nil

 }

 func (daemon *Daemon) Attach(streamConfig *StreamConfig, openStdin, stdinOnce, tty bool, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer) chan error {

@@ -1,37 +1,39 @@

 package daemon

 import (

+	"fmt"

+

 	"github.com/docker/docker/engine"

 )

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

+func (daemon *Daemon) ContainerChanges(job *engine.Job) error {

 	if n := len(job.Args); n != 1 {

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

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

 	}

 	name := job.Args[0]

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

-	if error != nil {

-		return job.Error(error)

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

+	if err != nil {

+		return err

 	}

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

 	changes, err := container.Changes()

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	for _, change := range changes {

 		out := &engine.Env{}

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

-			return job.Error(err)

+			return err

 		}

 		outs.Add(out)

 	}

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

-		return job.Error(err)

+		return err

 	}

-	return engine.StatusOK

+	return nil

 }

@@ -3,21 +3,22 @@ package daemon

 import (

 	"bytes"

 	"encoding/json"

+	"fmt"

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/runconfig"

 )

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

+func (daemon *Daemon) ContainerCommit(job *engine.Job) error {

 	if len(job.Args) != 1 {

-		return job.Errorf("Not enough arguments. Usage: %s CONTAINER\n", job.Name)

+		return fmt.Errorf("Not enough arguments. Usage: %s CONTAINER\n", job.Name)

 	}

 	name := job.Args[0]

 	container, err := daemon.Get(name)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	var (

@@ -33,22 +34,22 @@ func (daemon *Daemon) ContainerCommit(job *engine.Job) engine.Status {

 	buildConfigJob.Setenv("config", job.Getenv("config"))

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

-		return job.Error(err)

+		return err

 	}

 	if err := json.NewDecoder(stdoutBuffer).Decode(&newConfig); err != nil {

-		return job.Error(err)

+		return err

 	}

 	if err := runconfig.Merge(&newConfig, config); err != nil {

-		return job.Error(err)

+		return err

 	}

 	img, err := daemon.Commit(container, job.Getenv("repo"), job.Getenv("tag"), job.Getenv("comment"), job.Getenv("author"), job.GetenvBool("pause"), &newConfig)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	job.Printf("%s\n", img.ID)

-	return engine.StatusOK

+	return nil

 }

 // Commit creates a new filesystem image from the current state of a container.

@@ -1,14 +1,15 @@

 package daemon

 import (

+	"fmt"

 	"io"

 	"github.com/docker/docker/engine"

 )

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

+func (daemon *Daemon) ContainerCopy(job *engine.Job) error {

 	if len(job.Args) != 2 {

-		return job.Errorf("Usage: %s CONTAINER RESOURCE\n", job.Name)

+		return fmt.Errorf("Usage: %s CONTAINER RESOURCE\n", job.Name)

 	}

 	var (

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

 	container, err := daemon.Get(name)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	data, err := container.Copy(resource)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	defer data.Close()

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

-		return job.Error(err)

+		return err

 	}

-	return engine.StatusOK

+	return nil

 }

@@ -4,6 +4,7 @@ import (

 	"fmt"

 	"strings"

+	log "github.com/Sirupsen/logrus"

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/graph"

 	"github.com/docker/docker/image"

@@ -12,36 +13,36 @@ import (

 	"github.com/docker/libcontainer/label"

 )

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

+func (daemon *Daemon) ContainerCreate(job *engine.Job) error {

 	var name string

 	if len(job.Args) == 1 {

 		name = job.Args[0]

 	} else if len(job.Args) > 1 {

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

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

 	}

 	config := runconfig.ContainerConfigFromJob(job)

 	hostConfig := runconfig.ContainerHostConfigFromJob(job)

 	if len(hostConfig.LxcConf) > 0 && !strings.Contains(daemon.ExecutionDriver().Name(), "lxc") {

-		return job.Errorf("Cannot use --lxc-conf with execdriver: %s", daemon.ExecutionDriver().Name())

+		return fmt.Errorf("Cannot use --lxc-conf with execdriver: %s", daemon.ExecutionDriver().Name())

 	}

 	if hostConfig.Memory != 0 && hostConfig.Memory < 4194304 {

-		return job.Errorf("Minimum memory limit allowed is 4MB")

+		return fmt.Errorf("Minimum memory limit allowed is 4MB")

 	}

 	if hostConfig.Memory > 0 && !daemon.SystemConfig().MemoryLimit {

-		job.Errorf("Your kernel does not support memory limit capabilities. Limitation discarded.\n")

+		log.Printf("Your kernel does not support memory limit capabilities. Limitation discarded.\n")

 		hostConfig.Memory = 0

 	}

 	if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !daemon.SystemConfig().SwapLimit {

-		job.Errorf("Your kernel does not support swap limit capabilities. Limitation discarded.\n")

+		log.Printf("Your kernel does not support swap limit capabilities. Limitation discarded.\n")

 		hostConfig.MemorySwap = -1

 	}

 	if hostConfig.Memory > 0 && hostConfig.MemorySwap > 0 && hostConfig.MemorySwap < hostConfig.Memory {

-		return job.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage.\n")

+		return fmt.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage.\n")

 	}

 	if hostConfig.Memory == 0 && hostConfig.MemorySwap > 0 {

-		return job.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage.\n")

+		return fmt.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage.\n")

 	}

 	container, buildWarnings, err := daemon.Create(config, hostConfig, name)

@@ -51,22 +52,22 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) engine.Status {

 			if tag == "" {

 				tag = graph.DEFAULTTAG

 			}

-			return job.Errorf("No such image: %s (tag: %s)", config.Image, tag)

+			return fmt.Errorf("No such image: %s (tag: %s)", config.Image, tag)

 		}

-		return job.Error(err)

+		return err

 	}

 	if !container.Config.NetworkDisabled && daemon.SystemConfig().IPv4ForwardingDisabled {

-		job.Errorf("IPv4 forwarding is disabled.\n")

+		log.Printf("IPv4 forwarding is disabled.\n")

 	}

 	container.LogEvent("create")

 	job.Printf("%s\n", container.ID)

 	for _, warning := range buildWarnings {

-		job.Errorf("%s\n", warning)

+		log.Printf("%s\n", warning)

 	}

-	return engine.StatusOK

+	return nil

 }

 // Create creates a new container from the given configuration with a given name.

@@ -9,9 +9,9 @@ import (

 	"github.com/docker/docker/engine"

 )

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

+func (daemon *Daemon) ContainerRm(job *engine.Job) error {

 	if len(job.Args) != 1 {

-		return job.Errorf("Not enough arguments. Usage: %s CONTAINER\n", job.Name)

+		return fmt.Errorf("Not enough arguments. Usage: %s CONTAINER\n", job.Name)

 	}

 	name := job.Args[0]

 	removeVolume := job.GetenvBool("removeVolume")

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

 	container, err := daemon.Get(name)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	if removeLink {

 		name, err := GetFullContainerName(name)

 		if err != nil {

-			job.Error(err)

+			return err

+			// TODO: why was just job.Error(err) without return if the function cannot continue w/o container name?

+			//job.Error(err)

 		}

 		parent, n := path.Split(name)

 		if parent == "/" {

-			return job.Errorf("Conflict, cannot remove the default name of the container")

+			return fmt.Errorf("Conflict, cannot remove the default name of the container")

 		}

 		pe := daemon.ContainerGraph().Get(parent)

 		if pe == nil {

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

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

 		}

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

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

 		}

 		if err := daemon.ContainerGraph().Delete(name); err != nil {

-			return job.Error(err)

+			return err

 		}

-		return engine.StatusOK

+		return nil

 	}

 	if container != nil {

@@ -55,21 +57,21 @@ func (daemon *Daemon) ContainerRm(job *engine.Job) engine.Status {

 		if container.IsRunning() {

 			if forceRemove {

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

-					return job.Errorf("Could not kill running container, cannot remove - %v", err)

+					return fmt.Errorf("Could not kill running container, cannot remove - %v", err)

 				}

 			} else {

-				return job.Errorf("Conflict, You cannot remove a running container. Stop the container before attempting removal or use -f")

+				return fmt.Errorf("Conflict, You cannot remove a running container. Stop the container before attempting removal or use -f")

 			}

 		}

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

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

+			return fmt.Errorf("Cannot destroy container %s: %s", name, err)

 		}

 		container.LogEvent("destroy")

 		if removeVolume {

 			daemon.DeleteVolumes(container.VolumePaths())

 		}

 	}

-	return engine.StatusOK

+	return nil

 }

 func (daemon *Daemon) DeleteVolumes(volumeIDs map[string]struct{}) {

@@ -111,25 +111,25 @@ func (d *Daemon) getActiveContainer(name string) (*Container, error) {

 	return container, nil

 }

-func (d *Daemon) ContainerExecCreate(job *engine.Job) engine.Status {

+func (d *Daemon) ContainerExecCreate(job *engine.Job) error {

 	if len(job.Args) != 1 {

-		return job.Errorf("Usage: %s [options] container command [args]", job.Name)

+		return fmt.Errorf("Usage: %s [options] container command [args]", job.Name)

 	}

 	if strings.HasPrefix(d.execDriver.Name(), lxc.DriverName) {

-		return job.Error(lxc.ErrExec)

+		return lxc.ErrExec

 	}

 	var name = job.Args[0]

 	container, err := d.getActiveContainer(name)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	config, err := runconfig.ExecConfigFromJob(job)

 	if err != nil {

-		return job.Error(err)

+		return err

 	}

 	entrypoint, args := d.getEntrypointAndArgs(nil, config.Cmd)

@@ -157,12 +157,12 @@ func (d *Daemon) ContainerExecCreate(job *engine.Job) engine.Status {

 	job.Printf("%s\n", execConfig.ID)

-	return engine.StatusOK

+	return nil

 }

-func (d *Daemon) ContainerExecStart(job *engine.Job) engine.Status {

+func (d *Daemon) ContainerExecStart(job *engine.Job) error {

 	if len(job.Args) != 1 {

-		return job.Errorf("Usage: %s [options] exec", job.Name)

+		return fmt.Errorf("Usage: %s [options] exec", job.Name)

 	}

 	var (