Fixed another nullpointer