diff --git a/app.go b/app.go
index 2a11f8458..ab425b643 100644
--- a/app.go
+++ b/app.go
@@ -117,6 +117,7 @@ func (a *App) Run() error {
 				err := a.Stop()
 				if err != nil {
 					a.opts.logger.Errorf("failed to stop app: %v", err)
+					return err
 				}
 			}
 		}
diff --git a/contrib/registry/consul/client.go b/contrib/registry/consul/client.go
index cad32aaa5..a20588ed5 100644
--- a/contrib/registry/consul/client.go
+++ b/contrib/registry/consul/client.go
@@ -90,17 +90,19 @@ func (d *Client) Register(ctx context.Context, svc *registry.ServiceInstance, en
 		Port:            int(port),
 		Checks: []*api.AgentServiceCheck{
 			{
-				CheckID: "service:" + svc.ID,
-				TTL:     "50s",
-				Status:  "passing",
+				CheckID:                        "service:" + svc.ID,
+				TTL:                            "30s",
+				Status:                         "passing",
+				DeregisterCriticalServiceAfter: "90s",
 			},
 		},
 	}
 	if enableHealthCheck {
 		asr.Checks = append(asr.Checks, &api.AgentServiceCheck{
-			TCP:      fmt.Sprintf("%s:%d", addr, port),
-			Interval: "20s",
-			Status:   "passing",
+			TCP:                            fmt.Sprintf("%s:%d", addr, port),
+			Interval:                       "20s",
+			Status:                         "passing",
+			DeregisterCriticalServiceAfter: "90s",
 		})
 	}
 	err := d.cli.Agent().ServiceRegister(asr)