Fixed the other half of the NPE