Fixed save/load null ref error.