diff --git a/internal/cmd/cli.go b/internal/cmd/cli.go
index 3e2d08f..eb48b01 100644
--- a/internal/cmd/cli.go
+++ b/internal/cmd/cli.go
@@ -24,5 +24,10 @@ func init() {
 	cliCmd.AddCommand(endpointsCmd, handlerCmd, healthCmd)
 	endpointsCmd.AddCommand(getEndpoints)
 	handlerCmd.AddCommand(getHandlersCmd)
+	healthCmd.AddCommand(generalHealthCmd)
 	healthCmd.AddCommand(containerHealthCmd)
 }
+
+func ExecuteClientCommand() error {
+	return cliCmd.Execute()
+}
diff --git a/internal/cmd/health.go b/internal/cmd/health.go
index ce6d9a3..e8f979d 100644
--- a/internal/cmd/health.go
+++ b/internal/cmd/health.go
@@ -37,32 +37,58 @@ The output contains information about each component and it's health state.
 )
 
 type printableHealthInfo struct {
+	Component string
+	State     string
+	Message   string
 }
 
-func runGeneralHealth(_ *cobra.Command, _ []string) {
-	var err error
+func fromComponentsHealth(componentsHealth map[string]*rpc.ComponentHealth) (componentsInfo []printableHealthInfo) {
+	for componentName, component := range componentsHealth {
+		componentsInfo = append(componentsInfo, printableHealthInfo{
+			Component: componentName,
+			State:     component.State.String(),
+			Message:   component.Message,
+		})
+	}
+	return
+}
+
+func getHealthResult() (healthResp *rpc.HealthResponse, err error) {
 	var conn *grpc.ClientConn
 
 	if conn, err = grpc.Dial(inetMockSocketPath, grpc.WithInsecure()); err != nil {
-		fmt.Printf("Failed to connecto INetMock socket: %v\n", err)
-		os.Exit(10)
+		return
 	}
 
 	var healthClient = rpc.NewHealthClient(conn)
 	ctx, _ := context.WithTimeout(context.Background(), grpcTimeout)
-	var healthResp *rpc.HealthResponse
+	healthResp, err = healthClient.GetHealth(ctx, &rpc.HealthRequest{})
+	return
+}
 
-	if healthResp, err = healthClient.GetHealth(ctx, &rpc.HealthRequest{}); err != nil {
+func runGeneralHealth(_ *cobra.Command, _ []string) {
+	var healthResp *rpc.HealthResponse
+	var err error
+
+	if healthResp, err = getHealthResult(); err != nil {
 		fmt.Printf("Failed to get health information: %v", err)
 		os.Exit(1)
 	}
 
+	printable := fromComponentsHealth(healthResp.ComponentsHealth)
+
 	writer := format.Writer(outputFormat, os.Stdout)
-	if err = writer.Write(healthResp); err != nil {
+	if err = writer.Write(printable); err != nil {
 		fmt.Printf("Error occurred during writing response values: %v\n", err)
 	}
 }
 
 func runContainerHealth(_ *cobra.Command, _ []string) {
-
+	if healthResp, err := getHealthResult(); err != nil {
+		fmt.Printf("Failed to get health information: %v", err)
+		os.Exit(1)
+	} else if healthResp.OverallHealthState != rpc.HealthState_HEALTHY {
+		fmt.Println("Overall health state is not healthy")
+		os.Exit(1)
+	}
 }
diff --git a/internal/cmd/server.go b/internal/cmd/server.go
index 6c519f1..c9e0af2 100644
--- a/internal/cmd/server.go
+++ b/internal/cmd/server.go
@@ -34,7 +34,3 @@ func init() {
 func ExecuteServerCommand() error {
 	return serverCmd.Execute()
 }
-
-func ExecuteClientCommand() error {
-	return cliCmd.Execute()
-}
diff --git a/internal/rpc/grpc_api.go b/internal/rpc/grpc_api.go
index 23a8f00..2393b66 100644
--- a/internal/rpc/grpc_api.go
+++ b/internal/rpc/grpc_api.go
@@ -52,6 +52,8 @@ func (i *inetmockAPI) StartServer() (err error) {
 		endpointsManager: i.endpointManager,
 	})
 
+	RegisterHealthServer(i.server, &healthServer{})
+
 	go i.startServerAsync(lis)
 	return
 }