diff --git a/httputils/server.go b/httputils/server.go
index cb27cfe..f461b76 100644
--- a/httputils/server.go
+++ b/httputils/server.go
@@ -112,8 +112,10 @@ func (server *Server) GetExtraHeaders() map[string]string {
 	server.extraHeadersMutex.RLock()
 
 	r := make(map[string]string)
-	for key, value := range server.extraHeaders {
-		r[key] = value
+	if server.extraHeaders != nil {
+		for key, value := range server.extraHeaders {
+			r[key] = value
+		}
 	}
 	server.extraHeadersMutex.RUnlock()
 	return r
@@ -121,6 +123,9 @@ func (server *Server) GetExtraHeaders() map[string]string {
 
 func (server *Server) AddExtraHeader(key, value string) {
 	server.extraHeadersMutex.Lock()
+	if server.extraHeaders == nil {
+		server.extraHeaders = make(map[string]string)
+	}
 	server.extraHeaders[key] = value
 	server.extraHeadersMutex.Unlock()
 }