HH-37492 stricter handler release check