#538: Catch & Revoke