Better checking of HG2 use