Fixed more nullpointers