Fix a couple of null pointers that show up on slow computers