- Fix a potential NPE