Fixed build, still stuck with a gazillion nullpointers
Fixed nullpointer, changes seem to have fixed the build