diff --git a/server/client_test.go b/server/client_test.go
index 76e8c0b5..ce58d60f 100644
--- a/server/client_test.go
+++ b/server/client_test.go
@@ -33,7 +33,7 @@ func createClientAsync(ch chan *client, s *Server, cli net.Conn) {
 func rawSetup() (*Server, *client, *bufio.Reader, string) {
 	cli, srv := net.Pipe()
 	cr := bufio.NewReaderSize(cli, defaultBufSize)
-	s := New()
+	s := New(Options{})
 	ch := make(chan *client)
 	createClientAsync(ch, s, srv)
 	l, _ := cr.ReadString('\n')
diff --git a/server/server.go b/server/server.go
index 740b48e9..6dc9c2c0 100644
--- a/server/server.go
+++ b/server/server.go
@@ -43,6 +43,12 @@ type Server struct {
 }
 
 func optionDefaults(opt *Options) {
+	if opt.Host == "" {
+		opt.Host = DEFAULT_HOST
+	}
+	if opt.Port == 0 {
+		opt.Port = DEFAULT_PORT
+	}
 	if opt.MaxConn == 0 {
 		opt.MaxConn = DEFAULT_MAX_CONNECTIONS
 	}