diff --git a/modules/http_server/http_server.go b/modules/http_server/http_server.go
index f03aff73..a398dfbb 100644
--- a/modules/http_server/http_server.go
+++ b/modules/http_server/http_server.go
@@ -110,7 +110,8 @@ func (mod *HttpServer) Start() error {
 		var err error
 		mod.Info("starting on http://%s", mod.server.Addr)
 		if err = mod.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			panic(err)
+			mod.Error("%v", err)
+			mod.Stop()
 		}
 	})
 }