r1426 + handle nameless VIPs