diff --git a/scripts/setup/configure-rabbitmq b/scripts/setup/configure-rabbitmq
index da3baa5a95..23ef13ed5c 100755
--- a/scripts/setup/configure-rabbitmq
+++ b/scripts/setup/configure-rabbitmq
@@ -1,11 +1,11 @@
-#!/bin/sh
+#!/bin/sh -xe
 #
 # Delete the "guest" default user and replace it with a Zulip user
 # with a real password
 
 RMQPW=$($(dirname $0)/../../bin/get-django-setting RABBITMQ_PASSWORD)
 sudo rabbitmqctl delete_user zulip || true
-sudo rabbitmqctl delete_user guest
+sudo rabbitmqctl delete_user guest || true
 sudo rabbitmqctl add_user zulip $RMQPW
 sudo rabbitmqctl set_user_tags zulip administrator
 sudo rabbitmqctl set_permissions -p / zulip '.*' '.*' '.*'