Fix issue when there is no token