Update to alert error handling