diff --git a/elasticsearch.go b/elasticsearch.go
index 06a8fdbde3..ff200d7b5d 100644
--- a/elasticsearch.go
+++ b/elasticsearch.go
@@ -124,7 +124,10 @@ func NewClient(cfg Config) (*Client, error) {
 	}
 
 	if len(urls) == 0 {
-		u, _ := url.Parse(defaultURL) // errcheck exclude
+		u, err := url.Parse(defaultURL)
+		if err != nil {
+			return nil, fmt.Errorf("cannot parse default URL: %v", err)
+		}
 		urls = append(urls, u)
 	}
 
@@ -220,7 +223,7 @@ func addrsToURLs(addrs []string) ([]*url.URL, error) {
 	for _, addr := range addrs {
 		u, err := url.Parse(strings.TrimRight(addr, "/"))
 		if err != nil {
-			return nil, fmt.Errorf("cannot parse url: %v", err)
+			return nil, fmt.Errorf("cannot parse URL: %v", err)
 		}
 
 		urls = append(urls, u)