diff --git a/doh-client/client.go b/doh-client/client.go
index 1120e04..14ea2d2 100644
--- a/doh-client/client.go
+++ b/doh-client/client.go
@@ -223,9 +223,11 @@ func (c *Client) handlerFunc(w dns.ResponseWriter, r *dns.Msg, isTCP bool) {
 		panic("Unknown request Content-Type")
 	}
 
-	for _, header := range c.conf.DebugHTTPHeaders {
-		if value:= req.response.Header.Get(header); value != "" {
-			log.Printf("%s: %s\n", header, value)
+	if req.response != nil {
+		for _, header := range c.conf.DebugHTTPHeaders {
+			if value := req.response.Header.Get(header); value != "" {
+				log.Printf("%s: %s\n", header, value)
+			}
 		}
 	}
 	if req.err != nil {
diff --git a/doh-server/server.go b/doh-server/server.go
index e909bb1..bee558b 100644
--- a/doh-server/server.go
+++ b/doh-server/server.go
@@ -114,7 +114,7 @@ func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
 	}
 
 	for _, header := range s.conf.DebugHTTPHeaders {
-		if value:= r.Header.Get(header); value != "" {
+		if value := r.Header.Get(header); value != "" {
 			log.Printf("%s: %s\n", header, value)
 		}
 	}