Fix NODATA/NXDOMAIN responses