hwa-collector: refine HUP handling