nullpointer correction