Fixing savefile saving. Still throwing NPE