diff --git a/server.go b/server.go
index c5a0a4d6..9d33d6f0 100644
--- a/server.go
+++ b/server.go
@@ -642,11 +642,13 @@ func (srv *Server) serveDNS(w *response) {
 	req := new(Msg)
 	req.setHdr(dh)
 
-	if action := srv.MsgAcceptFunc(dh); action != MsgAccept {
-		if action == MsgIgnore {
-			return
-		}
+	switch srv.MsgAcceptFunc(dh) {
+	case MsgAccept:
 
+	case MsgIgnore:
+		return
+
+	case MsgReject:
 		req.SetRcodeFormatError(req)
 		// Are we allowed to delete any OPT records here?
 		req.Ns, req.Answer, req.Extra = nil, nil, nil
diff --git a/server_test.go b/server_test.go
index 58b4cde9..d850b8e4 100644
--- a/server_test.go
+++ b/server_test.go
@@ -102,7 +102,6 @@ func RunLocalTCPServerWithFinChan(laddr string) (*Server, string, chan error, er
 	}
 
 	server := &Server{Listener: l, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
-	server.init()
 
 	waitLock := sync.Mutex{}
 	waitLock.Lock()