diff --git a/api_test.go b/api_test.go
index de4289728e..06413e1303 100644
--- a/api_test.go
+++ b/api_test.go
@@ -56,7 +56,7 @@ func TestGetAuth(t *testing.T) {
 		t.Fatalf("%d OK or 0 expected, received %d\n", http.StatusOK, r.Code)
 	}
 
-	newAuthConfig := srv.registry.GetAuthConfig()
+	newAuthConfig := srv.registry.GetAuthConfig(false)
 	if newAuthConfig.Username != authConfig.Username ||
 		newAuthConfig.Email != authConfig.Email {
 		t.Fatalf("The auth configuration hasn't been set correctly")
diff --git a/docker/docker.go b/docker/docker.go
index 28b4d7f927..7b8aa7f858 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -24,8 +24,8 @@ func main() {
 		docker.SysInit()
 		return
 	}
-	host:= "127.0.0.1"
-	port:= 4243
+	host := "127.0.0.1"
+	port := 4243
 	// FIXME: Switch d and D ? (to be more sshd like)
 	flDaemon := flag.Bool("d", false, "Daemon mode")
 	flDebug := flag.Bool("D", false, "Debug mode")
@@ -40,15 +40,19 @@ func main() {
 		docker.NetworkBridgeIface = docker.DefaultNetworkBridge
 	}
 
-	if strings.Contains(*flHost, ":") && len(strings.Split(*flHost, ":")) == 2 {
+	if strings.Contains(*flHost, ":") {
 		hostParts := strings.Split(*flHost, ":")
+		if len(hostParts) != 2 {
+			log.Fatal("Invalid bind address format.")
+			os.Exit(-1)
+		}
 		if hostParts[0] != "" {
 			host = hostParts[0]
 		}
 		if p, err := strconv.Atoi(hostParts[1]); err == nil {
 			port = p
 		}
-	} else if !strings.Contains(*flHost, ":") {
+	} else {
 		host = *flHost
 	}