Adapt to the removal of catalog after token validation