diff --git a/client/driver/docker.go b/client/driver/docker.go
index ab0ac96e0..6fa1af600 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -431,7 +431,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
 
 			if len(containers) != 1 {
 				log.Printf("[ERR] driver.docker: failed to get id for container %s", config.Name)
-				return nil, fmt.Errorf("Failed to get id for container %s", config.Name, err)
+				return nil, fmt.Errorf("Failed to get id for container %s: %s", config.Name, err)
 			}
 
 			log.Printf("[INFO] driver.docker: a container with the name %s already exists; will attempt to purge and re-create", config.Name)
diff --git a/client/driver/docker_test.go b/client/driver/docker_test.go
index 4c9300579..5f4167e4a 100644
--- a/client/driver/docker_test.go
+++ b/client/driver/docker_test.go
@@ -545,3 +545,9 @@ func TestDockerDNS(t *testing.T) {
 		t.Errorf("DNS Servers don't match.\nExpected:\n%s\nGot:\n%s\n", task.Config["dns_search_domains"], container.HostConfig.DNSSearch)
 	}
 }
+
+func TestDockerAuth(t *testing.T) {
+	if !dockerIsConnected(t) {
+		t.SkipNow()
+	}
+}
diff --git a/website/Gemfile b/website/Gemfile
index 2b35e2810..d0e5a286b 100644
--- a/website/Gemfile
+++ b/website/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-ruby "2.2.2"
+ruby "2.2.3"
 
 gem "middleman-hashicorp", github: "hashicorp/middleman-hashicorp"