Fixed another null pointer exp