Added a fix for general exception handling
Updated Alerts
Merge branch 'staging'