Better null checks in token fetching logic

Better null checks in token fetching logic #7982