Fixed more null pointers.