[MODIFY] enhance to check with 401 response