diff --git a/api/client.go b/api/client.go
index f1f6754d35..2dc3911be5 100644
--- a/api/client.go
+++ b/api/client.go
@@ -116,12 +116,12 @@ func DefaultConfig() *Config {
 	}
 	if err := http2.ConfigureTransport(transport); err != nil {
 		config.Error = err
-		return nil
+		return config
 	}
 
 	if err := config.ReadEnvironment(); err != nil {
 		config.Error = err
-		return nil
+		return config
 	}
 
 	// Ensure redirects are not automatically followed
diff --git a/vault/testing.go b/vault/testing.go
index f8d73d46f4..97028a02f8 100644
--- a/vault/testing.go
+++ b/vault/testing.go
@@ -1275,6 +1275,9 @@ func NewTestCluster(t testing.T, base *CoreConfig, opts *TestClusterOptions) *Te
 			},
 		}
 		config := api.DefaultConfig()
+		if config.Error != nil {
+			t.Fatal(config.Error)
+		}
 		config.Address = fmt.Sprintf("https://127.0.0.1:%d", port)
 		config.HttpClient = client
 		apiClient, err := api.NewClient(config)