@@ -476,19 +476,17 @@ func (b *buildFile) CmdVolume(args string) error {

 func (b *buildFile) checkPathForAddition(orig string) error {

 	origPath := path.Join(b.contextPath, orig)

-	if p, err := filepath.EvalSymlinks(origPath); err != nil {

+	origPath, err := filepath.EvalSymlinks(origPath)

+	if err != nil {

 		if os.IsNotExist(err) {

 			return fmt.Errorf("%s: no such file or directory", orig)

 		}

 		return err

-	} else {

-		origPath = p

 	}

 	if !strings.HasPrefix(origPath, b.contextPath) {

 		return fmt.Errorf("Forbidden path outside the build context: %s (%s)", orig, origPath)

 	}

-	_, err := os.Stat(origPath)

-	if err != nil {

+	if _, err := os.Stat(origPath); err != nil {

 		if os.IsNotExist(err) {

 			return fmt.Errorf("%s: no such file or directory", orig)

 		}

@@ -910,7 +910,8 @@ func (container *Container) initializeNetworking() error {

 		container.HostsPath = hostsPath

 		return ioutil.WriteFile(container.HostsPath, content, 0644)

-	} else if container.hostConfig.NetworkMode.IsContainer() {

+	}

+	if container.hostConfig.NetworkMode.IsContainer() {

 		// we need to get the hosts files from the container to join

 		nc, err := container.getNetworkedContainer()

 		if err != nil {

@@ -920,16 +921,16 @@ func (container *Container) initializeNetworking() error {

 		container.ResolvConfPath = nc.ResolvConfPath

 		container.Config.Hostname = nc.Config.Hostname

 		container.Config.Domainname = nc.Config.Domainname

-	} else if container.daemon.config.DisableNetwork {

+		return nil

+	}

+	if container.daemon.config.DisableNetwork {

 		container.Config.NetworkDisabled = true

 		return container.buildHostnameAndHostsFiles("127.0.1.1")

-	} else {

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

-			return err

-		}

-		return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)

 	}

-	return nil

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

+		return err

+	}

+	return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)

 }

 // Make sure the config is compatible with the current kernel