applied Token Validation. I will fix error on main screen when closing