From d832b0b8598a8ce1f19c2dcd2fbc42c388b8a744 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@mozilla.com>
Date: Sun, 29 Nov 2020 11:18:29 -0500
Subject: [PATCH] fix merge error

---
 cli/src/cmd/debug.rs | 2 +-
 cli/src/cmd/start.rs | 2 +-
 cli/src/cmd/stop.rs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/src/cmd/debug.rs b/cli/src/cmd/debug.rs
index f81f605b7..8ebee75c6 100644
--- a/cli/src/cmd/debug.rs
+++ b/cli/src/cmd/debug.rs
@@ -30,7 +30,7 @@ define_subcommand! {
 
 subcommand_invocation! {
     fn run(&self, command: &CommandInvocation) -> Fallible<()> {
-        let mut replica = command.get_replica();
+        let mut replica = command.get_replica()?;
         let task = shared::get_task(&mut replica, &self.task)?;
 
         let mut t = Table::new();
diff --git a/cli/src/cmd/start.rs b/cli/src/cmd/start.rs
index 95365003c..5e09a5c13 100644
--- a/cli/src/cmd/start.rs
+++ b/cli/src/cmd/start.rs
@@ -28,7 +28,7 @@ define_subcommand! {
 
 subcommand_invocation! {
     fn run(&self, command: &CommandInvocation) -> Fallible<()> {
-        let mut replica = command.get_replica();
+        let mut replica = command.get_replica()?;
         let task = shared::get_task(&mut replica, &self.task)?;
         task.into_mut(&mut replica).start()?;
         Ok(())
diff --git a/cli/src/cmd/stop.rs b/cli/src/cmd/stop.rs
index d61eb8b51..baf278734 100644
--- a/cli/src/cmd/stop.rs
+++ b/cli/src/cmd/stop.rs
@@ -28,7 +28,7 @@ define_subcommand! {
 
 subcommand_invocation! {
     fn run(&self, command: &CommandInvocation) -> Fallible<()> {
-        let mut replica = command.get_replica();
+        let mut replica = command.get_replica()?;
         let task = shared::get_task(&mut replica, &self.task)?;
         task.into_mut(&mut replica).stop()?;
         Ok(())