Remove the check empty token and add catch the exception