Fixed an NPE, hopefully.