Fix a bug which caused dockerd to crash at startup if a container didn't have a registered mountpoint

Upstream-commit: 2548722dae1be15c61ee8db1a5eaa1d04ba7fcef
Component: engine

components/engine/container.go

@@ -1,9 +1,9 @@
 package docker
 
 import (
-	"github.com/dotcloud/docker/fs"
 	"encoding/json"
 	"errors"
+	"github.com/dotcloud/docker/fs"
 	"github.com/kr/pty"
 	"io"
 	"io/ioutil"
@@ -129,6 +129,8 @@ func loadContainer(store *fs.Store, containerPath string, netManager *NetworkMan
 	)
 	if err != nil {
 		return nil, err
+	} else if mountpoint == nil {
+		return nil, errors.New("Couldn't load container: unregistered mountpoint.")
 	}
 	container := &Container{
 		stdout:          newWriteBroadcaster(),