Better alerting if there are any issues