Server: improve behavior when accepting a new connection

Signed-off-by: Eduardo Silva <eduardo@monkey.io>