Removing deprecated code
Adding unhandled alert text to the exception message. Fixes issue 5652