fix null case id