fixed simple npe