Hopefully fixed null pointers.