Squash some more potential null pointer dereferences