Added rescue to message logic and changed toggle link