Fix a few npes.