Over sight on my side, ignore my comment about the NPE check