Update alerts and error handling