Handle alerts better