Make savegame loading more robust