diff --git a/lib/pact_broker/client/cli/broker.rb b/lib/pact_broker/client/cli/broker.rb
index ac201f4e..bd59902a 100644
--- a/lib/pact_broker/client/cli/broker.rb
+++ b/lib/pact_broker/client/cli/broker.rb
@@ -16,12 +16,8 @@ class Broker < Thor
 
         def can_i_deploy(*selectors)
           result = CanIDeploy.call(options.broker_base_url, selectors, {output: options.output}, pact_broker_client_options)
-          if result.success
-            $stdout.puts result.message
-          else
-            $stderr.puts result.message
-            exit(1)
-          end
+          $stdout.puts result.message
+          exit(1) unless result.success
         end
 
         desc 'version', "Show the pact_broker-client gem version"
diff --git a/spec/lib/pact_broker/client/cli/broker_spec.rb b/spec/lib/pact_broker/client/cli/broker_spec.rb
index 04b0d4bc..9ec9b5eb 100644
--- a/spec/lib/pact_broker/client/cli/broker_spec.rb
+++ b/spec/lib/pact_broker/client/cli/broker_spec.rb
@@ -52,7 +52,7 @@ module CLI
           let(:success) { false }
 
           it "prints the message to stderr" do
-            expect($stderr).to receive(:puts).with(message)
+            expect($stdout).to receive(:puts).with(message)
             begin
               invoke_can_i_deploy
             rescue SystemExit