fixed null returns for saves
0.1.16