added npe catch