fix other potential npe