Handle broker outages better