Added NULL check on disco response id