Issue #59 - Handle deleted tokens