I think this is code we can avoid. Can't we assume we always correctly use the popup service?