Fix a NPE