nullpointers fixed