diff --git a/agents/dnsagent.go b/agents/dnsagent.go
index e473a3fc0..61c44026c 100644
--- a/agents/dnsagent.go
+++ b/agents/dnsagent.go
@@ -62,7 +62,7 @@ func (da *DNSAgent) initDNSServer() (_ error) {
 		if strings.HasSuffix(da.cgrCfg.DNSAgentCfg().Listeners[i].Network, utils.TLSNoCaps) {
 			cert, err := tls.LoadX509KeyPair(da.cgrCfg.TLSCfg().ServerCerificate, da.cgrCfg.TLSCfg().ServerKey)
 			if err != nil {
-				return err
+				return fmt.Errorf("load certificate error <%v>", err)
 			}
 			da.servers[i].Net = "tcp-tls"
 			da.servers[i].TLSConfig = &tls.Config{
diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go
index 31549bf53..b3ee1b94b 100644
--- a/services/dnsagent_it_test.go
+++ b/services/dnsagent_it_test.go
@@ -204,8 +204,8 @@ func TestDNSAgentReload4(t *testing.T) {
 	dnsSrv.dns = nil
 	ctx, cancel := context.WithCancel(context.TODO())
 	err := dnsSrv.Start(ctx, cancel)
-	if err == nil || err.Error() != "open bad_certificate: no such file or directory" {
-		t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", "open bad_certificate: no such file or directory", err)
+	if err == nil || err.Error() != "load certificate error <open bad_certificate: no such file or directory>" {
+		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "load certificate error <open bad_certificate: no such file or directory>", err)
 	}
 	dnsSrv.dns = nil
 }
@@ -255,7 +255,7 @@ func TestDNSAgentReload6(t *testing.T) {
 	runtime.Gosched()
 	runtime.Gosched()
 	err = srv.Reload(ctx, cancel)
-	if err == nil || err.Error() != "open bad_certificate: no such file or directory" {
-		t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", "open bad_certificate: no such file or directory", err)
+	if err == nil || err.Error() != "load certificate error <open bad_certificate: no such file or directory>" {
+		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "load certificate error <open bad_certificate: no such file or directory>", err)
 	}
 }