Fix to support RabbitMQ unavailability