Remove old TryCatch. Improve AddMessageListener