Fixed nullpointerexception. Again.