More missing NPE check