Hopefully fix a nullpointerexception crash