Fix a few missed "if (!ptr)" cleanups