Add token checking; return correct status for failed requests