fix the npe