Actually fix NPE