Rebased changes to return on first start's error

Signed-off-by: Michael Crosby <michael@docker.com>