diff --git a/gnmi_server/clientCertAuth.go b/gnmi_server/clientCertAuth.go
index 381a915e1..cfab803ca 100644
--- a/gnmi_server/clientCertAuth.go
+++ b/gnmi_server/clientCertAuth.go
@@ -159,13 +159,14 @@ func ClientCertAuthenAndAuthor(ctx context.Context, serviceConfigTableName strin
 func TryDownload(url string) bool {
 	glog.Infof("Download CRL start: %s", url)
 	resp, err := http.Get(url)
-
-	if resp != nil {
-		defer resp.Body.Close()
+	if err != nil {
+		glog.Infof("Download CRL: %s failed: %v", url, err)
+		return false
 	}
+	defer resp.Body.Close()
 
-	if err != nil || resp.StatusCode != http.StatusOK {
-		glog.Infof("Download CRL: %s failed: %v", url, err)
+	if resp.StatusCode != http.StatusOK {
+		glog.Infof("Download CRL: %s failed: HTTP %d", url, resp.StatusCode)
 		return false
 	}