Actually fixed nullpointer