Handle bug when no data group exists for a policy