diff --git a/pkg/cmd/server/options.go b/pkg/cmd/server/options.go
index 30c1acc7a..f0e955c2b 100644
--- a/pkg/cmd/server/options.go
+++ b/pkg/cmd/server/options.go
@@ -52,8 +52,6 @@ func (o *ServerOptions) Run() error {
 	if err != nil {
 		return err
 	}
-	if _, err := route.NewCoreRoute(config); err == nil {
-		return nil
-	}
-	return nil
+	_, err = route.NewCoreRoute(config)
+	return err
 }
diff --git a/pkg/server/route/route.go b/pkg/server/route/route.go
index d872c409d..32639b269 100644
--- a/pkg/server/route/route.go
+++ b/pkg/server/route/route.go
@@ -128,8 +128,13 @@ func NewCoreRoute(config *server.Config) (*chi.Mux, error) {
 		})
 	}
 
+	err := http.ListenAndServe(fmt.Sprintf(":%d", config.Port), router)
+	if err != nil {
+		logger.Error(fmt.Sprintf("Error starting server: %s", err))
+		return router, err
+	}
+
 	logger.Info(fmt.Sprintf("Listening on :%d", config.Port))
-	http.ListenAndServe(fmt.Sprintf(":%d", config.Port), router)
 	logger.Info("Server Started...")
 
 	return router, nil