Add an NPE guard