REALLY fixed the nullpointer.