diff --git a/lib/mix/tasks/relay_follow.ex b/lib/mix/tasks/relay_follow.ex
index bec63af7c..85b1c024d 100644
--- a/lib/mix/tasks/relay_follow.ex
+++ b/lib/mix/tasks/relay_follow.ex
@@ -14,13 +14,11 @@ defmodule Mix.Tasks.RelayFollow do
   def run([target]) do
     Mix.Task.run("app.start")
 
-    {status, message} = Relay.follow(target)
-
-    if :ok == status do
+    with {:ok, activity} <- Relay.follow(target) do
       # put this task to sleep to allow the genserver to push out the messages
       :timer.sleep(500)
     else
-      Mix.puts("Error: #{inspect(message)}")
+      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
     end
   end
 end
diff --git a/lib/mix/tasks/relay_unfollow.ex b/lib/mix/tasks/relay_unfollow.ex
index df719af2b..237fb771c 100644
--- a/lib/mix/tasks/relay_unfollow.ex
+++ b/lib/mix/tasks/relay_unfollow.ex
@@ -13,13 +13,11 @@ defmodule Mix.Tasks.RelayUnfollow do
   def run([target]) do
     Mix.Task.run("app.start")
 
-    {status, message} = Relay.unfollow(target)
-
-    if :ok == status do
+    with {:ok, activity} <- Relay.follow(target) do
       # put this task to sleep to allow the genserver to push out the messages
       :timer.sleep(500)
     else
-      Mix.puts("Error: #{inspect(message)}")
+      {:error, e} -> Mix.shell().error("Error while following #{target}: #{inspect(e)}")
     end
   end
 end