ACTUALLY fix the NPE here.