Fixed nullpointer, hopefully